From 62f51a920654f23aca80226e4537d72c34e02285 Mon Sep 17 00:00:00 2001
From: Shaohua Li <shaohua.li@intel.com>
Date: Mon, 12 Dec 2005 00:37:02 -0800
Subject: [PATCH] --- yaml --- r: 15013 b: refs/heads/master c:
 82584ef75b7c14f22028595b0e8aa904464c5240 h: refs/heads/master i:   15011:
 1a7e026b480895785f44dcbd2dd62ea0cfd81547 v: v3

---
 [refs]                         | 2 +-
 trunk/arch/i386/kernel/traps.c | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 659f9b279580..2b60710b2601 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3e55c727ff7349c5db722fbdb8d99a151e8e0bf
+refs/heads/master: 82584ef75b7c14f22028595b0e8aa904464c5240
diff --git a/trunk/arch/i386/kernel/traps.c b/trunk/arch/i386/kernel/traps.c
index c34d1bfc5161..f0dffa03fbba 100644
--- a/trunk/arch/i386/kernel/traps.c
+++ b/trunk/arch/i386/kernel/traps.c
@@ -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))