[PATCH] x86: remove dead code

[Jan Beulich]

Neither __cpu_disable() nor __cpu_die() are being referenced without
CONFIG_HOTPLUG_CPU.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>

 arch/x86/kernel/smpboot_32.c |   11 -----------
 arch/x86/kernel/smpboot_64.c |   12 ------------
 2 files changed, 23 deletions(-)

--- linux-2.6.24-rc5/arch/x86/kernel/smpboot_32.c	2007-12-12 11:28:18.000000000 +0100
+++ 2.6.24-rc5-x86-cpu-die/arch/x86/kernel/smpboot_32.c	2007-12-07 16:12:01.000000000 +0100
@@ -1232,17 +1232,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 */
 
 int __cpuinit native_cpu_up(unsigned int cpu)
--- linux-2.6.24-rc5/arch/x86/kernel/smpboot_64.c	2007-12-12 11:28:18.000000000 +0100
+++ 2.6.24-rc5-x86-cpu-die/arch/x86/kernel/smpboot_64.c	2007-12-07 16:12:17.000000000 +0100
@@ -1084,16 +1084,4 @@ static __init int setup_additional_cpus(
 }
 early_param("additional_cpus", setup_additional_cpus);
 
-#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 */



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/