Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb

[linux-2.6] / kernel / irq / migration.c

diff --git a/kernel/irq/migration.c b/kernel/irq/migration.c
index 52a8655fa080047a64cf3dc39635d28c2183abb7..a12d00eb5e7c01e9495704fbfdae248ab081ed8e 100644 (file)
--- a/kernel/irq/migration.c
+++ b/kernel/irq/migration.c
@@ -1,6 +1,5 @@
-#include <linux/irq.h>
 
-#if defined(CONFIG_GENERIC_PENDING_IRQ)
+#include <linux/irq.h>
 
 void set_pending_irq(unsigned int irq, cpumask_t mask)
 {
@@ -31,7 +30,7 @@ void move_native_irq(int irq)
 
        desc->move_irq = 0;
 
-       if (likely(cpus_empty(pending_irq_cpumask[irq])))
+       if (unlikely(cpus_empty(pending_irq_cpumask[irq])))
                return;
 
        if (!desc->handler->set_affinity)
@@ -50,7 +49,7 @@ void move_native_irq(int irq)
         * cause some ioapics to mal-function.
         * Being paranoid i guess!
         */
-       if (unlikely(!cpus_empty(tmp))) {
+       if (likely(!cpus_empty(tmp))) {
                if (likely(!(desc->status & IRQ_DISABLED)))
                        desc->handler->disable(irq);
 
@@ -61,5 +60,3 @@ void move_native_irq(int irq)
        }
        cpus_clear(pending_irq_cpumask[irq]);
 }
-
-#endif