4 files changed, 15 insertions, 24 deletions

diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
index b713c44c6fb4..835d450797a1 100644
--- a/arch/arm/kernel/armksyms.c
+++ b/arch/arm/kernel/armksyms.c
@@ -41,7 +41,10 @@ extern void fp_enter(void);
  * This has a special calling convention; it doesn't
  * modify any of the usual registers, except for LR.
  */
+#define EXPORT_CRC_ALIAS(sym) __CRC_SYMBOL(sym, "")
+
 #define EXPORT_SYMBOL_ALIAS(sym,orig)           \
+ EXPORT_CRC_ALIAS(sym)                          \
  const struct kernel_symbol __ksymtab_##sym     \
   __attribute__((section("__ksymtab"))) =       \
     { (unsigned long)&orig, #sym };
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
index bd4823c74645..1155cf07c871 100644
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
@@ -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,28 +372,24 @@ __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
 
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 35b7273cfdb4..c9b69771f92e 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -737,8 +737,8 @@ void __init setup_arch(char **cmdline_p)
         if (mdesc->soft_reboot)
                 reboot_setup("s");
 
-        if (mdesc->param_offset)
-                tags = phys_to_virt(mdesc->param_offset);
+        if (mdesc->boot_params)
+                tags = phys_to_virt(mdesc->boot_params);
 
         /*
          * If we have the old style parameters, convert them to
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index 2fb0a4cfb37a..df2cb06ce424 100644
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -230,16 +230,8 @@ NORET_TYPE void die(const char *str, struct pt_regs *regs, int err)
         do_exit(SIGSEGV);
 }
 
-void die_if_kernel(const char *str, struct pt_regs *regs, int err)
-{
-        if (user_mode(regs))
-                return;
-
-        die(str, regs, err);
-}
-
-static void notify_die(const char *str, struct pt_regs *regs, siginfo_t *info,
-                       unsigned long err, unsigned long trap)
+void notify_die(const char *str, struct pt_regs *regs, struct siginfo *info,
+                unsigned long err, unsigned long trap)
 {
         if (user_mode(regs)) {
                 current->thread.error_code = err;