2 files changed, 4 insertions, 2 deletions

diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index cf682a73a6f9..da3e0dbe61d4 100644
--- a/include/linux/interrupt.h
+++ b/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/kernel/irq/manage.c b/kernel/irq/manage.c
index fede5fa351df..c911c6ec4dd6 100644
--- a/kernel/irq/manage.c
+++ b/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