diff options
author | Edward Donovan <edward.donovan@numble.net> | 2011-11-01 15:29:44 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-26 09:09:51 -0800 |
commit | 2cecc3d5df1bfb3356234b81cda993e187ac4f89 (patch) | |
tree | 1f4cfbf9717b67270738ea0540744002764c7b9c /kernel | |
parent | c7e2ea59cdd74342d3614bee9fc42fa2fb5add7e (diff) | |
download | linux-stable-2cecc3d5df1bfb3356234b81cda993e187ac4f89.tar.gz linux-stable-2cecc3d5df1bfb3356234b81cda993e187ac4f89.tar.bz2 linux-stable-2cecc3d5df1bfb3356234b81cda993e187ac4f89.zip |
genirq: Fix irqfixup, irqpoll regression
commit c75d720fca8a91ce99196d33adea383621027bf2 upstream.
commit d05c65fff0 ("genirq: spurious: Run only one poller at a time")
introduced a regression, leaving the boot options 'irqfixup' and
'irqpoll' non-functional. The patch placed tests in each function, to
exit if the function is already running. The test in 'misrouted_irq'
exited when it should have proceeded, effectively disabling
'misrouted_irq' and 'poll_spurious_irqs'.
The check for an already running poller needs to be "!= 1" not "== 1"
as "1" is the value when the first poller starts running.
Signed-off-by: Edward Donovan <edward.donovan@numble.net>
Cc: maciej.rutecki@gmail.com
Link: http://lkml.kernel.org/r/1320175784-6745-1-git-send-email-edward.donovan@numble.net
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/irq/spurious.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c index aa57d5da18c1..b5f4742693c0 100644 --- a/kernel/irq/spurious.c +++ b/kernel/irq/spurious.c @@ -115,7 +115,7 @@ static int misrouted_irq(int irq) struct irq_desc *desc; int i, ok = 0; - if (atomic_inc_return(&irq_poll_active) == 1) + if (atomic_inc_return(&irq_poll_active) != 1) goto out; irq_poll_cpu = smp_processor_id(); |