Skip to content

Commit

Permalink
[PATCH] genirq:fixup missing SA_PERCPU replacement
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Thomas Gleixner authored and Linus Torvalds committed Jul 3, 2006
1 parent 52e405e commit 284c668
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 2 additions & 0 deletions include/linux/interrupt.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions kernel/irq/manage.c
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand All @@ -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
Expand Down

0 comments on commit 284c668

Please sign in to comment.