From 8db48ef2c16457e95e3cefb6a1479b47272df6e6 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Mon, 3 Jul 2006 02:20:32 +0200
Subject: [PATCH] --- yaml --- r: 31743 b: refs/heads/master c:
 284c66806eb6df7f5c66d298681f1abe81a5a9ab h: refs/heads/master i:   31741:
 495a785aa35e1bc7aadc122cd99fe6f7a96be537   31739:
 10a03951e80e0425a6dcf0651be557744d13c80d   31735:
 d7cfeb30c4f0daba31757fa9149052cbd46b77ad   31727:
 c84161b28126d096eea545e0fbfe9ac84a0b83a3   31711:
 a87f16658700e61174d2d4268b19f3e833ff1f94   31679:
 ce0e63dbd7a2d8fbd101d0d64d296a21b309edeb   31615:
 180fc82e3f24b620812bdfb6b1646ddf67778a31   31487:
 ca506e38bb7fae35b951e392cafb7ea512a8de3b   31231:
 8958b5c693762287a3d1a2ae901b8fb32012736d   30719:
 9991833e64508655770c042b36e7664ece7b545d v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/interrupt.h | 2 ++
 trunk/kernel/irq/manage.c       | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index bf6b94d15298..0f5470c3a7a6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 52e405eaa9806968e88b35d65e57acad954a5ab5
+refs/heads/master: 284c66806eb6df7f5c66d298681f1abe81a5a9ab
diff --git a/trunk/include/linux/interrupt.h b/trunk/include/linux/interrupt.h
index cf682a73a6f9..da3e0dbe61d4 100644
--- a/trunk/include/linux/interrupt.h
+++ b/trunk/include/linux/interrupt.h
@@ -45,6 +45,7 @@
 #define IRQF_SHARED		0x00000080
 #define IRQF_PROBE_SHARED	0x00000100
 #define IRQF_TIMER		0x00000200
+#define IRQF_PERCPU		0x00000400
 
 /*
  * Migration helpers. Scheduled for removal in 1/2007
@@ -54,6 +55,7 @@
 #define SA_SAMPLE_RANDOM	IRQF_SAMPLE_RANDOM
 #define SA_SHIRQ		IRQF_SHARED
 #define SA_PROBEIRQ		IRQF_PROBE_SHARED
+#define SA_PERCPU		IRQF_PERCPU
 
 #define SA_TRIGGER_LOW		IRQF_TRIGGER_LOW
 #define SA_TRIGGER_HIGH		IRQF_TRIGGER_HIGH
diff --git a/trunk/kernel/irq/manage.c b/trunk/kernel/irq/manage.c
index fede5fa351df..c911c6ec4dd6 100644
--- a/trunk/kernel/irq/manage.c
+++ b/trunk/kernel/irq/manage.c
@@ -234,7 +234,7 @@ int setup_irq(unsigned int irq, struct irqaction *new)
 		    ((old->flags ^ new->flags) & IRQF_TRIGGER_MASK))
 			goto mismatch;
 
-#if defined(CONFIG_IRQ_PER_CPU) && defined(IRQF_PERCPU)
+#if defined(CONFIG_IRQ_PER_CPU)
 		/* All handlers must agree on per-cpuness */
 		if ((old->flags & IRQF_PERCPU) !=
 		    (new->flags & IRQF_PERCPU))
@@ -250,7 +250,7 @@ int setup_irq(unsigned int irq, struct irqaction *new)
 	}
 
 	*p = new;
-#if defined(CONFIG_IRQ_PER_CPU) && defined(IRQF_PERCPU)
+#if defined(CONFIG_IRQ_PER_CPU)
 	if (new->flags & IRQF_PERCPU)
 		desc->status |= IRQ_PER_CPU;
 #endif