This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / mips / au1000 / common / irq.c

diff --git a/arch/mips/au1000/common/irq.c b/arch/mips/au1000/common/irq.c
index a19bb7e..5104328 100644 (file)
--- a/arch/mips/au1000/common/irq.c
+++ b/arch/mips/au1000/common/irq.c
@@ -41,8 +41,8 @@
 #include <linux/slab.h>
 #include <linux/random.h>
 #include <linux/delay.h>
-#include <linux/bitops.h>
 
+#include <asm/bitops.h>
 #include <asm/bootinfo.h>
 #include <asm/io.h>
 #include <asm/mipsregs.h>
@@ -66,6 +66,10 @@
 #define EXT_INTC1_REQ1 5 /* IP 5 */
 #define MIPS_TIMER_IP  7 /* IP 7 */
 
+#ifdef CONFIG_KGDB
+extern void breakpoint(void);
+#endif
+
 extern asmlinkage void au1000_IRQ(void);
 extern void set_debug_traps(void);
 extern irq_cpustat_t irq_stat [NR_CPUS];
@@ -80,6 +84,7 @@ static inline void mask_and_ack_either_edge_irq(unsigned int irq_nr);
 inline void local_enable_irq(unsigned int irq_nr);
 inline void local_disable_irq(unsigned int irq_nr);
 
+extern void __init init_generic_irq(void);
 void   (*board_init_irq)(void);
 
 #ifdef CONFIG_PM
@@ -415,7 +420,7 @@ static void setup_local_irq(unsigned int irq_nr, int type, int int_req)
 }
 
 
-void __init arch_init_irq(void)
+void __init init_IRQ(void)
 {
        int i;
        unsigned long cp0_status;
@@ -429,6 +434,8 @@ void __init arch_init_irq(void)
        memset(irq_desc, 0, sizeof(irq_desc));
        set_except_vector(0, au1000_IRQ);
 
+       init_generic_irq();
+
        /* Initialize interrupt controllers to a safe state.
        */
        au_writel(0xffffffff, IC0_CFG0CLR);
@@ -475,6 +482,13 @@ void __init arch_init_irq(void)
        */
        if (board_init_irq)
                (*board_init_irq)();
+
+#ifdef CONFIG_KGDB
+       /* If local serial I/O used for debug port, enter kgdb at once */
+       puts("Waiting for kgdb to connect...");
+       set_debug_traps();
+       breakpoint();
+#endif
 }