Merge remote-tracking branches 'asoc/fix/da7219-pops' and 'asoc/fix/qcom' into asoc...

[karo-tx-linux.git] / arch / sparc / kernel / nmi.c

diff --git a/arch/sparc/kernel/nmi.c b/arch/sparc/kernel/nmi.c
index 5b1151dcba13b919cefde000a55949acb9a3ae6b..a9973bb4a1b228ae982bfd9a97fe9b7ab7aea6f4 100644 (file)
--- a/arch/sparc/kernel/nmi.c
+++ b/arch/sparc/kernel/nmi.c
@@ -100,20 +100,20 @@ notrace __kprobes void perfctr_irq(int irq, struct pt_regs *regs)
                pcr_ops->write_pcr(0, pcr_ops->pcr_nmi_disable);
 
        sum = local_cpu_data().irq0_irqs;
-       if (__get_cpu_var(nmi_touch)) {
-               __get_cpu_var(nmi_touch) = 0;
+       if (__this_cpu_read(nmi_touch)) {
+               __this_cpu_write(nmi_touch, 0);
                touched = 1;
        }
-       if (!touched && __get_cpu_var(last_irq_sum) == sum) {
+       if (!touched && __this_cpu_read(last_irq_sum) == sum) {
                __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(last_irq_sum, sum);
                __this_cpu_write(alert_counter, 0);
        }
-       if (__get_cpu_var(wd_enabled)) {
+       if (__this_cpu_read(wd_enabled)) {
                pcr_ops->write_pic(0, pcr_ops->nmi_picl_value(nmi_hz));
                pcr_ops->write_pcr(0, pcr_ops->pcr_nmi_enable);
        }
@@ -154,7 +154,7 @@ static void report_broken_nmi(int cpu, int *prev_nmi_count)
 void stop_nmi_watchdog(void *unused)
 {
        pcr_ops->write_pcr(0, pcr_ops->pcr_nmi_disable);
-       __get_cpu_var(wd_enabled) = 0;
+       __this_cpu_write(wd_enabled, 0);
        atomic_dec(&nmi_active);
 }
 
@@ -207,7 +207,7 @@ error:
 
 void start_nmi_watchdog(void *unused)
 {
-       __get_cpu_var(wd_enabled) = 1;
+       __this_cpu_write(wd_enabled, 1);
        atomic_inc(&nmi_active);
 
        pcr_ops->write_pcr(0, pcr_ops->pcr_nmi_disable);
@@ -218,7 +218,7 @@ void start_nmi_watchdog(void *unused)
 
 static void nmi_adjust_hz_one(void *unused)
 {
-       if (!__get_cpu_var(wd_enabled))
+       if (!__this_cpu_read(wd_enabled))
                return;
 
        pcr_ops->write_pcr(0, pcr_ops->pcr_nmi_disable);