Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

[pandora-kernel.git] / arch / mips / kernel / irq.c

diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c
index a990aad..e3309ff 100644 (file)
--- a/arch/mips/kernel/irq.c
+++ b/arch/mips/kernel/irq.c
@@ -93,7 +93,7 @@ int show_interrupts(struct seq_file *p, void *v)
        if (i == 0) {
                seq_printf(p, "           ");
                for_each_online_cpu(j)
-                       seq_printf(p, "CPU%d       ",j);
+                       seq_printf(p, "CPU%d       ", j);
                seq_putc(p, '\n');
        }
 
@@ -102,7 +102,7 @@ int show_interrupts(struct seq_file *p, void *v)
                action = irq_desc[i].action;
                if (!action)
                        goto skip;
-               seq_printf(p, "%3d: ",i);
+               seq_printf(p, "%3d: ", i);
 #ifndef CONFIG_SMP
                seq_printf(p, "%10u ", kstat_irqs(i));
 #else
@@ -145,6 +145,11 @@ __setup("nokgdb", nokgdb);
 
 void __init init_IRQ(void)
 {
+       int i;
+
+       for (i = 0; i < NR_IRQS; i++)
+               set_irq_noprobe(i);
+
        arch_init_irq();
 
 #ifdef CONFIG_KGDB