genirq: Remove CHECK_IRQ_PER_CPU from core code
authorThomas Gleixner <tglx@linutronix.de>
Tue, 8 Feb 2011 15:53:24 +0000 (16:53 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Sat, 19 Feb 2011 11:58:19 +0000 (12:58 +0100)
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
kernel/irq/manage.c
kernel/irq/migration.c

index 056aa49698b491d0c5ec7a703fe1245845d60c63..f1cfa271ba704998c90293a728813c3924231878 100644 (file)
@@ -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;
index 9485ae081dcd8efc14d412ad192b454809a44551..24f53caddf4773f05390b41bdb4b368982edcec8 100644 (file)
@@ -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;
        }