Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[linux-2.6.git] / arch / arm / boot / compressed / head.S

diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index 14a9ff9..b56f5e6 100644 (file)
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -8,6 +8,7 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
+#include <linux/config.h>
 #include <linux/linkage.h>
 
 /*
@@ -447,11 +448,8 @@ __common_mmu_cache_on:
                mov     r1, #-1
                mcr     p15, 0, r3, c2, c0, 0   @ load page table pointer
                mcr     p15, 0, r1, c3, c0, 0   @ load domain access control
-               b       1f
-               .align  5                       @ cache line aligned
-1:             mcr     p15, 0, r0, c1, c0, 0   @ load control register
-               mrc     p15, 0, r0, c1, c0, 0   @ and read it back to
-               sub     pc, lr, r0, lsr #32     @ properly flush pipeline
+               mcr     p15, 0, r0, c1, c0, 0   @ load control register
+               mov     pc, lr
 
 /*
  * All code following this line is relocatable.  It is relocated by
@@ -607,8 +605,8 @@ proc_types:
                b       __armv4_mmu_cache_off
                b       __armv4_mmu_cache_flush
 
-               .word   0x0007b000              @ ARMv6
-               .word   0x0007f000
+               .word   0x00070000              @ ARMv6
+               .word   0x000f0000
                b       __armv4_mmu_cache_on
                b       __armv4_mmu_cache_off
                b       __armv6_mmu_cache_flush