2 files changed, 7 insertions, 8 deletions

diff --git a/arch/sparc/kernel/nmi.c b/arch/sparc/kernel/nmi.c
index d242a734054..b287b62c7ea 100644
--- a/arch/sparc/kernel/nmi.c
+++ b/arch/sparc/kernel/nmi.c
@@ -21,7 +21,6 @@
 
 #include <asm/perf_event.h>
 #include <asm/ptrace.h>
-#include <asm/local.h>
 #include <asm/pcr.h>
 
 /* We don't have a real NMI on sparc64, but we can fake one
@@ -113,13 +112,13 @@ notrace __kprobes void perfctr_irq(int irq, struct pt_regs *regs)
                 touched = 1;
         }
         if (!touched && __get_cpu_var(last_irq_sum) == sum) {
-                __this_cpu_inc(per_cpu_var(alert_counter));
-                if (__this_cpu_read(per_cpu_var(alert_counter)) == 30 * nmi_hz)
+                __this_cpu_inc(alert_counter);
+                if (__this_cpu_read(alert_counter) == 30 * nmi_hz)
                         die_nmi("BUG: NMI Watchdog detected LOCKUP",
                                 regs, panic_on_timeout);
         } else {
                 __get_cpu_var(last_irq_sum) = sum;
-                __this_cpu_write(per_cpu_var(alert_counter), 0);
+                __this_cpu_write(alert_counter, 0);
         }
         if (__get_cpu_var(wd_enabled)) {
                 write_pic(picl_value(nmi_hz));
diff --git a/arch/sparc/kernel/rtrap_64.S b/arch/sparc/kernel/rtrap_64.S
index e829a42b713..83f1873c6c1 100644
--- a/arch/sparc/kernel/rtrap_64.S
+++ b/arch/sparc/kernel/rtrap_64.S
@@ -107,11 +107,11 @@ rtrap_nmi:	ldx			[%sp + PTREGS_OFF + PT_V9_TSTATE], %l1
 rtrap_irq:
 rtrap:
 #ifndef CONFIG_SMP
-                sethi                   %hi(per_cpu____cpu_data), %l0
-                lduw                    [%l0 + %lo(per_cpu____cpu_data)], %l1
+                sethi                   %hi(__cpu_data), %l0
+                lduw                    [%l0 + %lo(__cpu_data)], %l1
 #else
-                sethi                   %hi(per_cpu____cpu_data), %l0
-                or                      %l0, %lo(per_cpu____cpu_data), %l0
+                sethi                   %hi(__cpu_data), %l0
+                or                      %l0, %lo(__cpu_data), %l0
                 lduw                    [%l0 + %g5], %l1
 #endif
                 cmp                     %l1, 0