aboutsummaryrefslogtreecommitdiff
path: root/kernel/irq
diff options
context:
space:
mode:
authorBjorn Helgaas <bjorn.helgaas@hp.com>2006-07-01 04:35:44 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-01 09:55:57 -0700
commit17311c03c3e2c16d64d9e8cb2a3f45be2e2f8d3b (patch)
tree69e3f1f22323f0399c953584439b48ead7d2d5a8 /kernel/irq
parented6f7b10e657b98b4ba89385d02852c8bdf3980e (diff)
[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: Bjorn Helgaas <bjorn.helgaas@hp.com> Acked-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/irq')
-rw-r--r--kernel/irq/manage.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index b7117e81ac5..e3a122931e1 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -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