From f8289eff2164c182bc31da93342087b6c86387e1 Mon Sep 17 00:00:00 2001
From: Jan Beulich <jbeulich@novell.com>
Date: Mon, 4 Feb 2008 23:43:02 -0800
Subject: [PATCH] --- yaml --- r: 83323 b: refs/heads/master c:
 ef3c4cb936d854d1564172f2dcce9c20d1b08761 h: refs/heads/master i:   83321:
 c0700cc49640da48a5fc3b74129b438413ac5b59   83319:
 3d20ee2340f48866d692dbf30320fb7e9de615f3 v: v3

---
 [refs]                           |  2 +-
 trunk/arch/ia64/kernel/smpboot.c | 11 -----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 30f5ec0e17b8..a9f9d979c1e3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 920ed9f194effd10c273a4040114d3d8e6eed95f
+refs/heads/master: ef3c4cb936d854d1564172f2dcce9c20d1b08761
diff --git a/trunk/arch/ia64/kernel/smpboot.c b/trunk/arch/ia64/kernel/smpboot.c
index f0fc4d8465ad..480b1a5085d5 100644
--- a/trunk/arch/ia64/kernel/smpboot.c
+++ b/trunk/arch/ia64/kernel/smpboot.c
@@ -767,17 +767,6 @@ void __cpu_die(unsigned int cpu)
 	}
  	printk(KERN_ERR "CPU %u didn't die...\n", cpu);
 }
-#else /* !CONFIG_HOTPLUG_CPU */
-int __cpu_disable(void)
-{
-	return -ENOSYS;
-}
-
-void __cpu_die(unsigned int cpu)
-{
-	/* We said "no" in __cpu_disable */
-	BUG();
-}
 #endif /* CONFIG_HOTPLUG_CPU */
 
 void