4 files changed, 23 insertions, 13 deletions

diff --git a/arch/arm/kernel/debug.S b/arch/arm/kernel/debug.S
index b121b6053cce..5c91addcaebc 100644
--- a/arch/arm/kernel/debug.S
+++ b/arch/arm/kernel/debug.S
@@ -49,6 +49,26 @@
 1002:
                 .endm
 
+#elif defined(CONFIG_CPU_V7)
+
+                .macro  addruart, rx
+                .endm
+
+                .macro  senduart, rd, rx
+                mcr     p14, 0, \rd, c0, c5, 0
+                .endm
+
+                .macro  busyuart, rd, rx
+busy:           mrc     p14, 0, pc, c0, c1, 0
+                bcs     busy
+                .endm
+
+                .macro  waituart, rd, rx
+wait:           mrc     p14, 0, pc, c0, c1, 0
+                bcs     wait
+
+                .endm
+
 #elif defined(CONFIG_CPU_XSCALE)
 
                 .macro  addruart, rx
diff --git a/arch/arm/kernel/elf.c b/arch/arm/kernel/elf.c
index 950391f194c4..d4a0da1e48f4 100644
--- a/arch/arm/kernel/elf.c
+++ b/arch/arm/kernel/elf.c
@@ -78,15 +78,6 @@ int arm_elf_read_implies_exec(const struct elf32_hdr *x, int executable_stack)
                 return 1;
         if (cpu_architecture() < CPU_ARCH_ARMv6)
                 return 1;
-#if !defined(CONFIG_AEABI) || defined(CONFIG_OABI_COMPAT)
-        /*
-         * If we have support for OABI programs, we can never allow NX
-         * support - our signal syscall restart mechanism relies upon
-         * being able to execute code placed on the user stack.
-         */
-        return 1;
-#else
         return 0;
-#endif
 }
 EXPORT_SYMBOL(arm_elf_read_implies_exec);
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
index d2903e3bc861..6c5cf369183b 100644
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
@@ -957,9 +957,7 @@ kuser_cmpxchg_fixup:
 
 #else
 
-#ifdef CONFIG_SMP
-        mcr     p15, 0, r0, c7, c10, 5  @ dmb
-#endif
+        smp_dmb
 1:      ldrex   r3, [r2]
         subs    r3, r3, r0
         strexeq r3, r1, [r2]
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index 67304138a2ca..ba2adefa53f7 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -212,7 +212,8 @@ void __show_regs(struct pt_regs *regs)
         char buf[64];
 
         printk("CPU: %d    %s  (%s %.*s)\n",
-                smp_processor_id(), print_tainted(), init_utsname()->release,
+                raw_smp_processor_id(), print_tainted(),
+                init_utsname()->release,
                 (int)strcspn(init_utsname()->version, " "),
                 init_utsname()->version);
         print_symbol("PC is at %s\n", instruction_pointer(regs));