---

yaml --- r: 83323 b: refs/heads/master c: ef3c4cb h: refs/heads/master i: 83321: c0700cc 83319: 3d20ee2 v: v3
git-mirror · Feb 5, 2008 · f8289ef · f8289ef
1 parent a0ab443
commit f8289ef
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git 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
@@ -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