diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-02-08 10:53:24 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-02-19 06:58:19 -0500 |
| commit | fae581e588e64a0690f3fc995e404fcacaebe772 (patch) | |
| tree | 921a408384bf09834662a8e13af08eee87b66d30 /kernel | |
| parent | 8f53f92404bead2ab2154d45c8f508880bb5d95d (diff) | |
genirq: Remove CHECK_IRQ_PER_CPU from core code
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/irq/manage.c | 4 | ||||
| -rw-r--r-- | kernel/irq/migration.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 056aa49698b4..f1cfa271ba70 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c | |||
| @@ -73,8 +73,8 @@ int irq_can_set_affinity(unsigned int irq) | |||
| 73 | { | 73 | { |
| 74 | struct irq_desc *desc = irq_to_desc(irq); | 74 | struct irq_desc *desc = irq_to_desc(irq); |
| 75 | 75 | ||
| 76 | if (CHECK_IRQ_PER_CPU(desc->status) || !desc->irq_data.chip || | 76 | if ((desc->status & (IRQ_PER_CPU | IRQ_NO_BALANCING)) || |
| 77 | !desc->irq_data.chip->irq_set_affinity) | 77 | !desc->irq_data.chip || !desc->irq_data.chip->irq_set_affinity) |
| 78 | return 0; | 78 | return 0; |
| 79 | 79 | ||
| 80 | return 1; | 80 | return 1; |
diff --git a/kernel/irq/migration.c b/kernel/irq/migration.c index 9485ae081dcd..24f53caddf47 100644 --- a/kernel/irq/migration.c +++ b/kernel/irq/migration.c | |||
| @@ -15,7 +15,7 @@ void move_masked_irq(int irq) | |||
| 15 | /* | 15 | /* |
| 16 | * Paranoia: cpu-local interrupts shouldn't be calling in here anyway. | 16 | * Paranoia: cpu-local interrupts shouldn't be calling in here anyway. |
| 17 | */ | 17 | */ |
| 18 | if (CHECK_IRQ_PER_CPU(desc->status)) { | 18 | if (desc->status & (IRQ_PER_CPU | IRQ_NO_BALANCING)) { |
| 19 | WARN_ON(1); | 19 | WARN_ON(1); |
| 20 | return; | 20 | return; |
| 21 | } | 21 | } |
