From 9fa041b8cfecb68491d935f73fa4cbad0d8b0edf Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date: Sat, 1 Jul 2006 04:35:44 -0700
Subject: [PATCH] --- yaml --- r: 31534 b: refs/heads/master c:
 17311c03c3e2c16d64d9e8cb2a3f45be2e2f8d3b h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/irq/manage.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b788759e3851..d318e8c4361c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ed6f7b10e657b98b4ba89385d02852c8bdf3980e
+refs/heads/master: 17311c03c3e2c16d64d9e8cb2a3f45be2e2f8d3b
diff --git a/trunk/kernel/irq/manage.c b/trunk/kernel/irq/manage.c
index b7117e81ac56..e3a122931e1a 100644
--- a/trunk/kernel/irq/manage.c
+++ b/trunk/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