aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2008-02-08 07:22:02 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-08 12:22:42 -0500
commit24649c00ca334955ac7d8a79f5a7834fc7ea441d (patch)
treef043e44b733edf19e8c291fab24bfe72449325f0
parent46f4f8f665080900e865392f4b3593be463bf0d8 (diff)
MIPS: Mark all but i8259 interrupts as no-probe.
Use set_irq_noprobe() to mark all MIPS interrupts as non-probe. Override that default for i8259 interrupts. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Acked-and-tested-by: Rob Landley <rob@landley.net> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Cc: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/mips/kernel/i8259.c4
-rw-r--r--arch/mips/kernel/irq.c5
2 files changed, 8 insertions, 1 deletions
diff --git a/arch/mips/kernel/i8259.c b/arch/mips/kernel/i8259.c
index 197d7977de35..413bd1d37f54 100644
--- a/arch/mips/kernel/i8259.c
+++ b/arch/mips/kernel/i8259.c
@@ -338,8 +338,10 @@ void __init init_i8259_irqs(void)
338 338
339 init_8259A(0); 339 init_8259A(0);
340 340
341 for (i = I8259A_IRQ_BASE; i < I8259A_IRQ_BASE + 16; i++) 341 for (i = I8259A_IRQ_BASE; i < I8259A_IRQ_BASE + 16; i++) {
342 set_irq_chip_and_handler(i, &i8259A_chip, handle_level_irq); 342 set_irq_chip_and_handler(i, &i8259A_chip, handle_level_irq);
343 set_irq_probe(i);
344 }
343 345
344 setup_irq(I8259A_IRQ_BASE + PIC_CASCADE_IR, &irq2); 346 setup_irq(I8259A_IRQ_BASE + PIC_CASCADE_IR, &irq2);
345} 347}
diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c
index d06e9c9af790..e3309ff9ece4 100644
--- a/arch/mips/kernel/irq.c
+++ b/arch/mips/kernel/irq.c
@@ -145,6 +145,11 @@ __setup("nokgdb", nokgdb);
145 145
146void __init init_IRQ(void) 146void __init init_IRQ(void)
147{ 147{
148 int i;
149
150 for (i = 0; i < NR_IRQS; i++)
151 set_irq_noprobe(i);
152
148 arch_init_irq(); 153 arch_init_irq();
149 154
150#ifdef CONFIG_KGDB 155#ifdef CONFIG_KGDB