aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-02-08 16:53:24 +0100
committerThomas Gleixner <tglx@linutronix.de>2011-02-19 12:58:19 +0100
commitfae581e588e64a0690f3fc995e404fcacaebe772 (patch)
tree921a408384bf09834662a8e13af08eee87b66d30
parent8f53f92404bead2ab2154d45c8f508880bb5d95d (diff)
downloadlinux-stericsson-fae581e588e64a0690f3fc995e404fcacaebe772.tar.gz
genirq: Remove CHECK_IRQ_PER_CPU from core code
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--kernel/irq/manage.c4
-rw-r--r--kernel/irq/migration.c2
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)
{
struct irq_desc *desc = irq_to_desc(irq);
- if (CHECK_IRQ_PER_CPU(desc->status) || !desc->irq_data.chip ||
- !desc->irq_data.chip->irq_set_affinity)
+ if ((desc->status & (IRQ_PER_CPU | IRQ_NO_BALANCING)) ||
+ !desc->irq_data.chip || !desc->irq_data.chip->irq_set_affinity)
return 0;
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)
/*
* Paranoia: cpu-local interrupts shouldn't be calling in here anyway.
*/
- if (CHECK_IRQ_PER_CPU(desc->status)) {
+ if (desc->status & (IRQ_PER_CPU | IRQ_NO_BALANCING)) {
WARN_ON(1);
return;
}