Commit aa1b052a authored Nov 17, 2011 by Linus Torvalds

Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  genirq: Fix irqfixup, irqpoll regression

kernel/irq/spurious.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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();