Skip to content

Commit

Permalink
[PATCH] x86: fix NMI with CPU hotplug
Browse files Browse the repository at this point in the history
With CPU hotplug enabled, NMI watchdog stoped working.  It appears the
violation is the cpu_online check in nmi handler.  local ACPI based NMI
watchdog is initialized before we set CPU online for APs.  It's quite
possible a NMI is fired before we set CPU online, and that's what happens
here.

Signed-off-by: Shaohua Li <shaohua.li@intel.com>
Acked-by: Zwane Mwaikambo <zwane@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Shaohua Li authored and Linus Torvalds committed Dec 12, 2005
1 parent b3e55c7 commit 82584ef
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions arch/i386/kernel/traps.c
Original file line number Diff line number Diff line change
Expand Up @@ -650,13 +650,6 @@ fastcall void do_nmi(struct pt_regs * regs, long error_code)

cpu = smp_processor_id();

#ifdef CONFIG_HOTPLUG_CPU
if (!cpu_online(cpu)) {
nmi_exit();
return;
}
#endif

++nmi_count(cpu);

if (!rcu_dereference(nmi_callback)(regs, cpu))
Expand Down

0 comments on commit 82584ef

Please sign in to comment.