diff --git a/[refs] b/[refs] index fc7cf0e1fa6d..72fe1db568d1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d20d04bc9befbd752092b4aa42bb8254a1af0776 +refs/heads/master: 89d0cf01c0aa9e8241cc3703a359ecd6abf3c28a diff --git a/trunk/kernel/irq/migration.c b/trunk/kernel/irq/migration.c index 134f9f2e0e39..a12d00eb5e7c 100644 --- a/trunk/kernel/irq/migration.c +++ b/trunk/kernel/irq/migration.c @@ -30,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) @@ -49,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);