diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-03-22 05:22:58 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-03-22 05:22:58 -0500 |
commit | bec1b8193651ea4394cc4d6e18152cb83e735f93 (patch) | |
tree | 7df3c9603a745b9f390a9132837c6909c4b96db3 | |
parent | 58e9ff56382bdce340d50b6ff22c422dc617106c (diff) |
[ARM] Quieten spurious IRQ detection
Only issue a "nobody cared" warning after 99900 spurious interrupts.
This avoids the occasional spurious interrupt causing warnings, as
per x86.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r-- | arch/arm/kernel/irq.c | 11 | ||||
-rw-r--r-- | include/asm-arm/mach/irq.h | 1 |
2 files changed, 9 insertions, 3 deletions
diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c index 1d50d2b98f55..2d5896b36181 100644 --- a/arch/arm/kernel/irq.c +++ b/arch/arm/kernel/irq.c | |||
@@ -305,14 +305,19 @@ report_bad_irq(unsigned int irq, struct pt_regs *regs, struct irqdesc *desc, int | |||
305 | static int count = 100; | 305 | static int count = 100; |
306 | struct irqaction *action; | 306 | struct irqaction *action; |
307 | 307 | ||
308 | if (!count || noirqdebug) | 308 | if (noirqdebug) |
309 | return; | 309 | return; |
310 | 310 | ||
311 | count--; | ||
312 | |||
313 | if (ret != IRQ_HANDLED && ret != IRQ_NONE) { | 311 | if (ret != IRQ_HANDLED && ret != IRQ_NONE) { |
312 | if (!count) | ||
313 | return; | ||
314 | count--; | ||
314 | printk("irq%u: bogus retval mask %x\n", irq, ret); | 315 | printk("irq%u: bogus retval mask %x\n", irq, ret); |
315 | } else { | 316 | } else { |
317 | desc->irqs_unhandled++; | ||
318 | if (desc->irqs_unhandled <= 99900) | ||
319 | return; | ||
320 | desc->irqs_unhandled = 0; | ||
316 | printk("irq%u: nobody cared\n", irq); | 321 | printk("irq%u: nobody cared\n", irq); |
317 | } | 322 | } |
318 | show_regs(regs); | 323 | show_regs(regs); |
diff --git a/include/asm-arm/mach/irq.h b/include/asm-arm/mach/irq.h index 76d05244c632..d4d420ecf3a8 100644 --- a/include/asm-arm/mach/irq.h +++ b/include/asm-arm/mach/irq.h | |||
@@ -74,6 +74,7 @@ struct irqdesc { | |||
74 | unsigned int noautoenable : 1; /* don't automatically enable IRQ */ | 74 | unsigned int noautoenable : 1; /* don't automatically enable IRQ */ |
75 | unsigned int unused :25; | 75 | unsigned int unused :25; |
76 | 76 | ||
77 | unsigned int irqs_unhandled; | ||
77 | struct proc_dir_entry *procdir; | 78 | struct proc_dir_entry *procdir; |
78 | 79 | ||
79 | #ifdef CONFIG_SMP | 80 | #ifdef CONFIG_SMP |