Merge master.kernel.org:/home/rmk/linux-2.6-serial

[karo-tx-linux.git] / arch / arm / kernel / head.S

diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
index bd4823c74645f0899f91d61199f000a5342be40d..53962635134862263fb2719b3293249dc53187cc 100644 (file)
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
@@ -20,7 +20,7 @@
 #include <asm/mach-types.h>
 #include <asm/procinfo.h>
 #include <asm/ptrace.h>
-#include <asm/constants.h>
+#include <asm/asm-offsets.h>
 #include <asm/thread_info.h>
 #include <asm/system.h>
 
@@ -344,9 +344,9 @@ __create_page_tables:
        str     r6, [r0]
 #endif
 
+#ifdef CONFIG_DEBUG_LL
        bic     r7, r7, #0x0c                   @ turn off cacheable
                                                @ and bufferable bits
-#ifdef CONFIG_DEBUG_LL
        /*
         * Map in IO space for serial debugging.
         * This allows debug messages to be output
@@ -372,27 +372,23 @@ __create_page_tables:
        teq     r1, #MACH_TYPE_NETWINDER
        teqne   r1, #MACH_TYPE_CATS
        bne     1f
-       add     r0, r4, #0x3fc0                 @ ff000000
-       mov     r3, #0x7c000000
-       orr     r3, r3, r7
-       str     r3, [r0], #4
-       add     r3, r3, #1 << 20
-       str     r3, [r0], #4
+       add     r0, r4, #0xff000000 >> 18
+       orr     r3, r7, #0x7c000000
+       str     r3, [r0]
 1:
 #endif
-#endif
 #ifdef CONFIG_ARCH_RPC
        /*
         * Map in screen at 0x02000000 & SCREEN2_BASE
         * Similar reasons here - for debug.  This is
         * only for Acorn RiscPC architectures.
         */
-       add     r0, r4, #0x80                   @ 02000000
-       mov     r3, #0x02000000
-       orr     r3, r3, r7
+       add     r0, r4, #0x02000000 >> 18
+       orr     r3, r7, #0x02000000
        str     r3, [r0]
-       add     r0, r4, #0x3600                 @ d8000000
+       add     r0, r4, #0xd8000000 >> 18
        str     r3, [r0]
+#endif
 #endif
        mov     pc, lr
        .ltorg