* grub-core/kern/arm/cache.S: Replace = with explicit litteral load.

diff --git a/ChangeLog b/ChangeLog
index f4f8757aa8427e8a60e087be17958655f935ba75..f88de28c12b7ac7a482b3e2364d57cfa8019e707 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/kern/arm/cache.S: Replace = with explicit litteral load.
+
 2013-11-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * 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 1f524e6d761929c3182dd3bd053f8b0b2a203318..8522d24705b3cb147b85aba7d7b758ec40ee3778 100644 (file)
--- 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