1 files changed, 7 insertions, 9 deletions

diff --git a/arch/arm/mm/proc-sa110.S b/arch/arm/mm/proc-sa110.S
index 5a760a2c629..eeacf601d6e 100644
--- a/arch/arm/mm/proc-sa110.S
+++ b/arch/arm/mm/proc-sa110.S
@@ -185,11 +185,12 @@ __sa110_setup:
 #ifdef CONFIG_MMU
         mcr     p15, 0, r10, c8, c7             @ invalidate I,D TLBs on v4
 #endif
+
+        adr     r5, sa110_crval
+        ldmia   r5, {r5, r6}
         mrc     p15, 0, r0, c1, c0              @ get control register v4
-        ldr     r5, sa110_cr1_clear
         bic     r0, r0, r5
-        ldr     r5, sa110_cr1_set
-        orr     r0, r0, r5
+        orr     r0, r0, r6
         mov     pc, lr
         .size   __sa110_setup, . - __sa110_setup
 
@@ -199,12 +200,9 @@ __sa110_setup:
          * ..01 0001 ..11 1101
          * 
          */
-        .type   sa110_cr1_clear, #object
-        .type   sa110_cr1_set, #object
-sa110_cr1_clear:
-        .word   0x3f3f
-sa110_cr1_set:
-        .word   0x113d
+        .type   sa110_crval, #object
+sa110_crval:
+        crval   clear=0x00003f3f, mmuset=0x0000113d, ucset=0x00001130
 
         __INITDATA