summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorDaniel Walker <dwalker@mvista.com>2006-06-23 11:05:29 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-23 16:43:04 +0200
commit89d0cf01c0aa9e8241cc3703a359ecd6abf3c28a (patch)
tree149611b8bbd430d482299f5b976da6a6cfc1e718 /kernel
parent[PATCH] ISDN: correctly handle isdn_writebuf_stub() errors (diff)
downloadlinux-89d0cf01c0aa9e8241cc3703a359ecd6abf3c28a.tar.xz
linux-89d0cf01c0aa9e8241cc3703a359ecd6abf3c28a.zip
[PATCH] invert irq/migration.c brach prediction
If you get to that point in the code it means that desc->move_irq is set, pending_irq_cpumask[irq] and cpu_online_map should have a value. Still pretty good chance anding those two you'll still have a value. So these two branch predictors should be inverted. Signed-off-by: Daniel Walker <dwalker@mvista.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/irq/migration.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/irq/migration.c b/kernel/irq/migration.c
index 134f9f2e0e39..a12d00eb5e7c 100644
--- a/kernel/irq/migration.c
+++ b/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);