From 497b70131c00d85ae389a2bf6a80d2d3a4dda0b3 Mon Sep 17 00:00:00 2001 From: Russell King Date: Wed, 22 Mar 2006 10:22:58 +0000 Subject: [PATCH] --- yaml --- r: 22851 b: refs/heads/master c: bec1b8193651ea4394cc4d6e18152cb83e735f93 h: refs/heads/master i: 22849: 2b9fb5bb61d649a2cd5045cd781ec31a9c3645ef 22847: 057faf7d202d02b7e5efec8ac63a8493e16afbd3 v: v3 --- [refs] | 2 +- trunk/arch/arm/kernel/irq.c | 11 ++++++++--- trunk/include/asm-arm/mach/irq.h | 1 + 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c5cdc5047b2e..281f24684cde 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 58e9ff56382bdce340d50b6ff22c422dc617106c +refs/heads/master: bec1b8193651ea4394cc4d6e18152cb83e735f93 diff --git a/trunk/arch/arm/kernel/irq.c b/trunk/arch/arm/kernel/irq.c index 1d50d2b98f55..2d5896b36181 100644 --- a/trunk/arch/arm/kernel/irq.c +++ b/trunk/arch/arm/kernel/irq.c @@ -305,14 +305,19 @@ report_bad_irq(unsigned int irq, struct pt_regs *regs, struct irqdesc *desc, int static int count = 100; struct irqaction *action; - if (!count || noirqdebug) + if (noirqdebug) return; - count--; - if (ret != IRQ_HANDLED && ret != IRQ_NONE) { + if (!count) + return; + count--; printk("irq%u: bogus retval mask %x\n", irq, ret); } else { + desc->irqs_unhandled++; + if (desc->irqs_unhandled <= 99900) + return; + desc->irqs_unhandled = 0; printk("irq%u: nobody cared\n", irq); } show_regs(regs); diff --git a/trunk/include/asm-arm/mach/irq.h b/trunk/include/asm-arm/mach/irq.h index 76d05244c632..d4d420ecf3a8 100644 --- a/trunk/include/asm-arm/mach/irq.h +++ b/trunk/include/asm-arm/mach/irq.h @@ -74,6 +74,7 @@ struct irqdesc { unsigned int noautoenable : 1; /* don't automatically enable IRQ */ unsigned int unused :25; + unsigned int irqs_unhandled; struct proc_dir_entry *procdir; #ifdef CONFIG_SMP