Merge to Fedora kernel-2.6.18-1.2255_FC5 patched with stable patch-2.6.18.5-vs2.0...

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

diff --git a/arch/mips/vr4181/common/irq.c b/arch/mips/vr4181/common/irq.c
index 7b5a1a4..2cdf77c 100644 (file)
--- a/arch/mips/vr4181/common/irq.c
+++ b/arch/mips/vr4181/common/irq.c
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2001 MontaVista Software Inc.
  * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net
+ * Copyright (C) 2005 Ralf Baechle (ralf@linux-mips.org)
  *
  * linux/arch/mips/vr4181/common/irq.c
  *     Completely re-written to use the new irq.c
@@ -12,7 +13,6 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  */
-#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/kernel_stat.h>
@@ -180,14 +180,13 @@ extern int setup_irq(unsigned int irq, struct irqaction *irqaction);
 extern void mips_cpu_irq_init(u32 irq_base);
 
 static struct irqaction cascade =
-       { no_action, SA_INTERRUPT, 0, "cascade", NULL, NULL };
+       { no_action, SA_INTERRUPT, CPU_MASK_NONE, "cascade", NULL, NULL };
 static struct irqaction reserved =
-       { no_action, SA_INTERRUPT, 0, "cascade", NULL, NULL };
+       { no_action, SA_INTERRUPT, CPU_MASK_NONE, "cascade", NULL, NULL };
 
-void __init init_IRQ(void)
+void __init arch_init_irq(void)
 {
        int i;
-       extern irq_desc_t irq_desc[];
 
        set_except_vector(0, vr4181_handle_irq);
 
@@ -237,13 +236,4 @@ void __init init_IRQ(void)
         */
        setup_irq(VR4181_IRQ_RTCL1, &reserved);
        setup_irq(VR4181_IRQ_RTCL2, &reserved);
-
-#ifdef CONFIG_KGDB
-       printk("Setting debug traps - please connect the remote debugger.\n");
-
-       set_debug_traps();
-
-       // you may move this line to whereever you want
-       breakpoint();
-#endif
 }