From bb5a2f8f9e25555089f7c1c90f9f8ecf473adf6f Mon Sep 17 00:00:00 2001
From: Glauber Costa <gcosta@redhat.com>
Date: Mon, 3 Mar 2008 14:12:44 -0300
Subject: [PATCH] --- yaml --- r: 88712 b: refs/heads/master c:
 3428f3d6caa3bc2adde050a2771a2821eb46f901 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/x86/kernel/smp_64.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index aad0bf17eb71..860c849f8346 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7930e53422d3d06ea873199f66c288806d37cc94
+refs/heads/master: 3428f3d6caa3bc2adde050a2771a2821eb46f901
diff --git a/trunk/arch/x86/kernel/smp_64.c b/trunk/arch/x86/kernel/smp_64.c
index a434f6c55f83..b040224927ca 100644
--- a/trunk/arch/x86/kernel/smp_64.c
+++ b/trunk/arch/x86/kernel/smp_64.c
@@ -420,9 +420,6 @@ int smp_call_function_single (int cpu, void (*func) (void *info), void *info,
 	/* prevent preemption and reschedule on another processor */
 	int ret, me = get_cpu();
 
-	/* Can deadlock when called with interrupts disabled */
-	WARN_ON(irqs_disabled());
-
 	if (cpu == me) {
 		local_irq_disable();
 		func(info);