1 files changed, 6 insertions, 9 deletions

diff --git a/arch/arm/mm/proc-arm1022.S b/arch/arm/mm/proc-arm1022.S
index 92218e6b3906..e435974062f6 100644
--- a/arch/arm/mm/proc-arm1022.S
+++ b/arch/arm/mm/proc-arm1022.S
@@ -404,11 +404,11 @@ __arm1022_setup:
 #ifdef CONFIG_MMU
         mcr     p15, 0, r0, c8, c7              @ invalidate I,D TLBs on v4
 #endif
+        adr     r5, arm1022_crval
+        ldmia   r5, {r5, r6}
         mrc     p15, 0, r0, c1, c0              @ get control register v4
-        ldr     r5, arm1022_cr1_clear
         bic     r0, r0, r5
-        ldr     r5, arm1022_cr1_set
-        orr     r0, r0, r5
+        orr     r0, r0, r6
 #ifdef CONFIG_CPU_CACHE_ROUND_ROBIN
         orr     r0, r0, #0x4000                 @ .R..............
 #endif
@@ -421,12 +421,9 @@ __arm1022_setup:
          * .011 1001 ..11 0101
          * 
          */
-        .type   arm1022_cr1_clear, #object
-        .type   arm1022_cr1_set, #object
-arm1022_cr1_clear:
-        .word   0x7f3f
-arm1022_cr1_set:
-        .word   0x3935
+        .type   arm1022_crval, #object
+arm1022_crval:
+        crval   clear=0x00007f3f, mmuset=0x00003935, ucset=0x00001930
 
         __INITDATA