diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-09-17 14:40:19 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-09-17 14:40:49 -0700 |
| commit | 3bb045f1e2e51124200ef043256df4c7ad86bebd (patch) | |
| tree | 78e4150fc7108bef4d8fa183d7f7dc00beb73a54 /arch/x86/kernel/irq_32.c | |
| parent | 80938332d8cf652f6b16e0788cf0ca136befe0b5 (diff) | |
| parent | dcb73bf402e0d5b28ce925dbbe4dab3b00b21eee (diff) | |
Merge branch 'x86/pat' into x86/urgent
Merge reason:
Suresh Siddha (1):
x86, pat: don't use rb-tree based lookup in reserve_memtype()
... requires previous x86/pat commits already pushed to Linus.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/kernel/irq_32.c')
| -rw-r--r-- | arch/x86/kernel/irq_32.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c index 3b09634a515..7d35d0fe232 100644 --- a/arch/x86/kernel/irq_32.c +++ b/arch/x86/kernel/irq_32.c @@ -218,7 +218,6 @@ bool handle_irq(unsigned irq, struct pt_regs *regs) void fixup_irqs(void) { unsigned int irq; - static int warned; struct irq_desc *desc; for_each_irq_desc(irq, desc) { @@ -236,8 +235,8 @@ void fixup_irqs(void) } if (desc->chip->set_affinity) desc->chip->set_affinity(irq, affinity); - else if (desc->action && !(warned++)) - printk("Cannot set affinity for irq %i\n", irq); + else if (desc->action) + printk_once("Cannot set affinity for irq %i\n", irq); } #if 0 |