- patches.fixes/patch-2.6.11-rc1: 2.6.11-rc1.

[linux-flexiantxendom0-3.2.10.git] / arch / i386 / kernel / reboot.c

diff --git a/arch/i386/kernel/reboot.c b/arch/i386/kernel/reboot.c
index 47b188b..dd06362 100644 (file)
--- a/arch/i386/kernel/reboot.c
+++ b/arch/i386/kernel/reboot.c
@@ -3,10 +3,6 @@
  */
 
 #include <linux/mm.h>
-#include <linux/config.h>
-#ifdef CONFIG_KDB
-#include <linux/kdb.h>
-#endif /* CONFIG_KDB */
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/init.h>
@@ -334,14 +330,6 @@ void machine_restart(char * __unused)
         * Stop all CPUs and turn off local APICs and the IO-APIC, so
         * other OSs see a clean IRQ state.
         */
-#ifdef CONFIG_KDB
-       /*
-        * If this restart is occuring while kdb is running (e.g. reboot
-        * command), the other CPU's are already stopped.  Don't try to
-        * stop them yet again.
-        */
-       if (!KDB_IS_RUNNING())
-#endif /* CONFIG_KDB */
        smp_send_stop();
 #endif /* CONFIG_SMP */