Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17311c03 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Linus Torvalds
Browse files

[PATCH] IRQ: Use SA_PERCPU_IRQ, not IRQ_PER_CPU, for irqaction.flags 



IRQ_PER_CPU is a bit in the struct irq_desc "status" field, not in the
struct irqaction "flags", so the previous code checked the wrong bit.

SA_PERCPU_IRQ is only used by drivers/char/mmtimer.c for SGI ia64 boxes.

Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ed6f7b10

kernel/irq/manage.c

+2 −1
Original line number Diff line number Diff line
@@ -236,7 +236,8 @@ int setup_irq(unsigned int irq, struct irqaction *new) 


#if defined(CONFIG_IRQ_PER_CPU) && defined(SA_PERCPU_IRQ)

		/* All handlers must agree on per-cpuness */

		if ((old->flags & IRQ_PER_CPU) != (new->flags & IRQ_PER_CPU))

		if ((old->flags & SA_PERCPU_IRQ) !=

		    (new->flags & SA_PERCPU_IRQ))

			goto mismatch;

#endif