Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1955b5f authored by Tejun Heo's avatar Tejun Heo
Browse files

x86: Use this_cpu_inc_return for nmi counter 



this_cpu_inc_return() saves us a memory access there.

Reviewed-by: default avatarPekka Enberg <penberg@kernel.org>
Reviewed-by: default avatarMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Acked-by: default avatarH. Peter Anvin <hpa@zytor.com>
Acked-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarChristoph Lameter <cl@linux.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 7b543a53

arch/x86/kernel/apic/nmi.c

+1 −2
Original line number Diff line number Diff line
@@ -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..

			 */