diff options
| author | Tejun Heo <tj@kernel.org> | 2010-12-18 16:30:48 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-12-30 12:22:17 +0100 |
| commit | c1955b5f3a95717ce1f5235f6e9968da068e3183 (patch) | |
| tree | e6ff2d3c733612fe96bc4c7314901bc3bb3650f9 /arch | |
| parent | x86: Replace uses of current_cpu_data with this_cpu ops (diff) | |
| download | linux-c1955b5f3a95717ce1f5235f6e9968da068e3183.tar.xz linux-c1955b5f3a95717ce1f5235f6e9968da068e3183.zip | |
x86: Use this_cpu_inc_return for nmi counter
this_cpu_inc_return() saves us a memory access there.
Reviewed-by: Pekka Enberg <penberg@kernel.org>
Reviewed-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Acked-by: H. Peter Anvin <hpa@zytor.com>
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/apic/nmi.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/apic/nmi.c b/arch/x86/kernel/apic/nmi.c index b387dce0b409..37769cc4fe55 100644 --- a/arch/x86/kernel/apic/nmi.c +++ b/arch/x86/kernel/apic/nmi.c @@ -432,8 +432,7 @@ nmi_watchdog_tick(struct pt_regs *regs, unsigned reason) * Ayiee, looks like this CPU is stuck ... * wait a few IRQs (5 seconds) before doing the oops ... */ - __this_cpu_inc(alert_counter); - if (__this_cpu_read(alert_counter) == 5 * nmi_hz) + if (__this_cpu_inc_return(alert_counter) == 5 * nmi_hz) /* * die_nmi will return ONLY if NOTIFY_STOP happens.. */ |