git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
this_cpu: Use this_cpu_xx in nmi handling
[pandora-kernel.git]
/
arch
/
sparc
/
kernel
/
nmi.c
diff --git
a/arch/sparc/kernel/nmi.c
b/arch/sparc/kernel/nmi.c
index
b129611
..
f30f4a1
100644
(file)
--- a/
arch/sparc/kernel/nmi.c
+++ b/
arch/sparc/kernel/nmi.c
@@
-47,7
+47,7
@@
static DEFINE_PER_CPU(short, wd_enabled);
static int endflag __initdata;
static DEFINE_PER_CPU(unsigned int, last_irq_sum);
static int endflag __initdata;
static DEFINE_PER_CPU(unsigned int, last_irq_sum);
-static DEFINE_PER_CPU(lo
cal_t
, alert_counter);
+static DEFINE_PER_CPU(lo
ng
, alert_counter);
static DEFINE_PER_CPU(int, nmi_touch);
void touch_nmi_watchdog(void)
static DEFINE_PER_CPU(int, nmi_touch);
void touch_nmi_watchdog(void)
@@
-112,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) {
touched = 1;
}
if (!touched && __get_cpu_var(last_irq_sum) == sum) {
-
local_inc(&__get
_cpu_var(alert_counter));
- if (
local_read(&__get
_cpu_var(alert_counter)) == 30 * nmi_hz)
+
__this_cpu_inc(per
_cpu_var(alert_counter));
+ if (
__this_cpu_read(per
_cpu_var(alert_counter)) == 30 * nmi_hz)
die_nmi("BUG: NMI Watchdog detected LOCKUP",
regs, panic_on_timeout);
} else {
__get_cpu_var(last_irq_sum) = sum;
die_nmi("BUG: NMI Watchdog detected LOCKUP",
regs, panic_on_timeout);
} else {
__get_cpu_var(last_irq_sum) = sum;
-
local_set(&__get
_cpu_var(alert_counter), 0);
+
__this_cpu_write(per
_cpu_var(alert_counter), 0);
}
if (__get_cpu_var(wd_enabled)) {
write_pic(picl_value(nmi_hz));
}
if (__get_cpu_var(wd_enabled)) {
write_pic(picl_value(nmi_hz));