From 814986155466cdc7da5abb36b4981008279001e7 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Wed, 13 Nov 2013 06:23:32 +0100 Subject: [PATCH] * grub-core/kern/arm/cache.S: Replace = with explicit litteral load. --- ChangeLog | 4 ++++ grub-core/kern/arm/cache.S | 9 +++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f4f8757aa..f88de28c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-11-13 Vladimir Serbinenko + + * grub-core/kern/arm/cache.S: Replace = with explicit litteral load. + 2013-11-13 Vladimir Serbinenko * include/grub/symbol.h (END) [__arm__]: New macros. Replace all .end diff --git a/grub-core/kern/arm/cache.S b/grub-core/kern/arm/cache.S index 1f524e6d7..8522d2470 100644 --- a/grub-core/kern/arm/cache.S +++ b/grub-core/kern/arm/cache.S @@ -32,11 +32,16 @@ * Simple cache maintenance functions */ +dlinesz_addr: + .long EXT_C(grub_arch_cache_dlinesz) +ilinesz_addr: + .long EXT_C(grub_arch_cache_ilinesz) + @ r0 - *beg (inclusive) @ r1 - *end (exclusive) clean_dcache_range: @ Clean data cache for range to point-of-unification - ldr r2, =EXT_C(grub_arch_cache_dlinesz) + ldr r2, dlinesz_addr ldr r2, [r2] sub r3, r2, #1 @ align "beg" to start of line mvn r3, r3 @@ -57,7 +62,7 @@ clean_dcache_range: @ r1 - *end (exclusive) invalidate_icache_range: @ Invalidate instruction cache for range to point-of-unification - ldr r2, =EXT_C(grub_arch_cache_ilinesz) + ldr r2, ilinesz_addr ldr r2, [r2] sub r3, r2, #1 @ align "beg" to start of line mvn r3, r3