---

yaml --- r: 120807 b: refs/heads/master c: c415b3d h: refs/heads/master i: 120805: eca235f 120803: 5d7bd9c 120799: 49c1e58 v: v3
git-mirror · Nov 12, 2008 · 75a4ca8 · 75a4ca8
1 parent 05b5f3a
commit 75a4ca8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bb8dd270e62217e2d2172094c6c352c4ddc0a127
+refs/heads/master: c415b3dce30dfb41234e118662e8720f47343a4f
diff --git a/trunk/arch/x86/kernel/reboot.c b/trunk/arch/x86/kernel/reboot.c
@@ -577,6 +577,7 @@ static struct notifier_block crash_nmi_nb = {
 void nmi_shootdown_cpus(nmi_shootdown_cb callback)
 {
 	unsigned long msecs;
+	local_irq_disable();
 
 	/* Make a note of crashing cpu. Will be used in NMI callback.*/
 	crashing_cpu = safe_smp_processor_id();