Commit 284c6680 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Linus Torvalds
Browse files

[PATCH] genirq:fixup missing SA_PERCPU replacement



The irqflags consolidation converted SA_PERCPU_IRQ to IRQF_PERCPU but
did not define the new constant.
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 52e405ea
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
#define IRQF_SHARED 0x00000080 #define IRQF_SHARED 0x00000080
#define IRQF_PROBE_SHARED 0x00000100 #define IRQF_PROBE_SHARED 0x00000100
#define IRQF_TIMER 0x00000200 #define IRQF_TIMER 0x00000200
#define IRQF_PERCPU 0x00000400
/* /*
* Migration helpers. Scheduled for removal in 1/2007 * Migration helpers. Scheduled for removal in 1/2007
...@@ -54,6 +55,7 @@ ...@@ -54,6 +55,7 @@
#define SA_SAMPLE_RANDOM IRQF_SAMPLE_RANDOM #define SA_SAMPLE_RANDOM IRQF_SAMPLE_RANDOM
#define SA_SHIRQ IRQF_SHARED #define SA_SHIRQ IRQF_SHARED
#define SA_PROBEIRQ IRQF_PROBE_SHARED #define SA_PROBEIRQ IRQF_PROBE_SHARED
#define SA_PERCPU IRQF_PERCPU
#define SA_TRIGGER_LOW IRQF_TRIGGER_LOW #define SA_TRIGGER_LOW IRQF_TRIGGER_LOW
#define SA_TRIGGER_HIGH IRQF_TRIGGER_HIGH #define SA_TRIGGER_HIGH IRQF_TRIGGER_HIGH
......
...@@ -234,7 +234,7 @@ int setup_irq(unsigned int irq, struct irqaction *new) ...@@ -234,7 +234,7 @@ int setup_irq(unsigned int irq, struct irqaction *new)
((old->flags ^ new->flags) & IRQF_TRIGGER_MASK)) ((old->flags ^ new->flags) & IRQF_TRIGGER_MASK))
goto mismatch; goto mismatch;
#if defined(CONFIG_IRQ_PER_CPU) && defined(IRQF_PERCPU) #if defined(CONFIG_IRQ_PER_CPU)
/* All handlers must agree on per-cpuness */ /* All handlers must agree on per-cpuness */
if ((old->flags & IRQF_PERCPU) != if ((old->flags & IRQF_PERCPU) !=
(new->flags & IRQF_PERCPU)) (new->flags & IRQF_PERCPU))
...@@ -250,7 +250,7 @@ int setup_irq(unsigned int irq, struct irqaction *new) ...@@ -250,7 +250,7 @@ int setup_irq(unsigned int irq, struct irqaction *new)
} }
*p = new; *p = new;
#if defined(CONFIG_IRQ_PER_CPU) && defined(IRQF_PERCPU) #if defined(CONFIG_IRQ_PER_CPU)
if (new->flags & IRQF_PERCPU) if (new->flags & IRQF_PERCPU)
desc->status |= IRQ_PER_CPU; desc->status |= IRQ_PER_CPU;
#endif #endif
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment