diff options
| author | Len Brown <len.brown@intel.com> | 2009-09-19 00:11:26 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-09-19 00:11:26 -0400 |
| commit | c602c65b2f81d14456771d1e3f15d1381f4b7efa (patch) | |
| tree | f1f833c8dd6c1519eeb101be32f7fe54a9605af5 /arch/x86/kernel/irq_32.c | |
| parent | 3834f47291df475be3f0f0fb7ccaa098967cc054 (diff) | |
| parent | 78f28b7c555359c67c2a0d23f7436e915329421e (diff) | |
| download | linux-next-c602c65b2f81d14456771d1e3f15d1381f4b7efa.tar.gz | |
Merge branch 'linus' into sfi-release
Conflicts:
arch/x86/kernel/setup.c
drivers/acpi/power.c
init/main.c
Signed-off-by: Len Brown <len.brown@intel.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 3b09634a5153..7d35d0fe2329 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 |