diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2006-07-02 20:20:32 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-02 20:29:22 -0400 |
commit | 284c66806eb6df7f5c66d298681f1abe81a5a9ab (patch) | |
tree | b6573efe262b85a5bd3cf3c2a7964214143125ed /kernel/irq/manage.c | |
parent | 52e405eaa9806968e88b35d65e57acad954a5ab5 (diff) |
[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: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/irq/manage.c')
-rw-r--r-- | kernel/irq/manage.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) | |||
234 | ((old->flags ^ new->flags) & IRQF_TRIGGER_MASK)) | 234 | ((old->flags ^ new->flags) & IRQF_TRIGGER_MASK)) |
235 | goto mismatch; | 235 | goto mismatch; |
236 | 236 | ||
237 | #if defined(CONFIG_IRQ_PER_CPU) && defined(IRQF_PERCPU) | 237 | #if defined(CONFIG_IRQ_PER_CPU) |
238 | /* All handlers must agree on per-cpuness */ | 238 | /* All handlers must agree on per-cpuness */ |
239 | if ((old->flags & IRQF_PERCPU) != | 239 | if ((old->flags & IRQF_PERCPU) != |
240 | (new->flags & IRQF_PERCPU)) | 240 | (new->flags & IRQF_PERCPU)) |
@@ -250,7 +250,7 @@ int setup_irq(unsigned int irq, struct irqaction *new) | |||
250 | } | 250 | } |
251 | 251 | ||
252 | *p = new; | 252 | *p = new; |
253 | #if defined(CONFIG_IRQ_PER_CPU) && defined(IRQF_PERCPU) | 253 | #if defined(CONFIG_IRQ_PER_CPU) |
254 | if (new->flags & IRQF_PERCPU) | 254 | if (new->flags & IRQF_PERCPU) |
255 | desc->status |= IRQ_PER_CPU; | 255 | desc->status |= IRQ_PER_CPU; |
256 | #endif | 256 | #endif |