diff options
author | Tim Gardner <timg@tpi.com> | 2011-11-20 19:44:30 -0500 |
---|---|---|
committer | Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com> | 2011-11-21 12:55:18 -0500 |
commit | 8b54d87cf36f4ba5fab325f76865cc7f3621224c (patch) | |
tree | 1e12834e235bcf570ebb017a1700f32712be051c /kernel | |
parent | 20744b8e7b7b7b2f514d5b989e862cac015973dd (diff) |
genirq: Fix irqfixup, irqpoll regression
BugLink: http://bugs.launchpad.net/bugs/855199
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
Cc: stable@vger.kernel.org # >= 2.6.39
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
(cherry picked from commit c75d720fca8a91ce99196d33adea383621027bf2)
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Herton Krzesinski <herton.krzesinski@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
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 aa57d5da18c..b5f4742693c 100644 --- a/kernel/irq/spurious.c +++ b/kernel/irq/spurious.c | |||
@@ -115,7 +115,7 @@ static int misrouted_irq(int irq) | |||
115 | struct irq_desc *desc; | 115 | struct irq_desc *desc; |
116 | int i, ok = 0; | 116 | int i, ok = 0; |
117 | 117 | ||
118 | if (atomic_inc_return(&irq_poll_active) == 1) | 118 | if (atomic_inc_return(&irq_poll_active) != 1) |
119 | goto out; | 119 | goto out; |
120 | 120 | ||
121 | irq_poll_cpu = smp_processor_id(); | 121 | irq_poll_cpu = smp_processor_id(); |