From: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date: Sat, 1 Jul 2006 11:35:44 +0000 (-0700)
Subject: [PATCH] IRQ: Use SA_PERCPU_IRQ, not IRQ_PER_CPU, for irqaction.flags
X-Git-Tag: v2.6.18-rc1~248
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17311c03c3e2c16d64d9e8cb2a3f45be2e2f8d3b;p=linux-2.6

[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>
---

diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index b7117e81ac..e3a122931e 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