From 75a4ca8a3e5192aebef434c35dd6d1538ed8a196 Mon Sep 17 00:00:00 2001
From: Eduardo Habkost <ehabkost@redhat.com>
Date: Wed, 12 Nov 2008 11:34:44 -0200
Subject: [PATCH] --- yaml --- r: 120807 b: refs/heads/master c:
 c415b3dce30dfb41234e118662e8720f47343a4f h: refs/heads/master i:   120805:
 eca235f22d3debfc047ab0dda16b956afb0dca4e   120803:
 5d7bd9c5180ac2edbd5d6a1c64e27fdce99ca831   120799:
 49c1e58673c06ed8fa84527abbf9ba287d29ff32 v: v3

---
 [refs]                         | 2 +-
 trunk/arch/x86/kernel/reboot.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index eb913a2cb9be..a75009d3e920 100644
--- 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
index 17a41e055565..c3cd512484e5 100644
--- 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();