1 files changed, 12 insertions, 18 deletions

diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c
index 6045b9a51a3..4b4007b3083 100644
--- a/arch/mips/kernel/irq.c
+++ b/arch/mips/kernel/irq.c
@@ -21,11 +21,16 @@
 #include <linux/sched.h>
 #include <linux/seq_file.h>
 #include <linux/kallsyms.h>
+#include <linux/kgdb.h>
 
 #include <asm/atomic.h>
 #include <asm/system.h>
 #include <asm/uaccess.h>
 
+#ifdef CONFIG_KGDB
+int kgdb_early_setup;
+#endif
+
 static unsigned long irq_map[NR_IRQS / BITS_PER_LONG];
 
 int allocate_irqno(void)
@@ -126,33 +131,22 @@ asmlinkage void spurious_interrupt(void)
         atomic_inc(&irq_err_count);
 }
 
-#ifdef CONFIG_KGDB
-extern void breakpoint(void);
-extern void set_debug_traps(void);
-
-static int kgdb_flag = 1;
-static int __init nokgdb(char *str)
-{
-        kgdb_flag = 0;
-        return 1;
-}
-__setup("nokgdb", nokgdb);
-#endif
-
 void __init init_IRQ(void)
 {
         int i;
 
+#ifdef CONFIG_KGDB
+        if (kgdb_early_setup)
+                return;
+#endif
+
         for (i = 0; i < NR_IRQS; i++)
                 set_irq_noprobe(i);
 
         arch_init_irq();
 
 #ifdef CONFIG_KGDB
-        if (kgdb_flag) {
-                printk("Wait for gdb client connection ...\n");
-                set_debug_traps();
-                breakpoint();
-        }
+        if (!kgdb_early_setup)
+                kgdb_early_setup = 1;
 #endif
 }