summary refs log tree commit diff
path: root/mm/slab.c
diff options
context:
space:
mode:
authorTim Blechmann <tim@klingt.org>2009-11-30 18:59:34 +0100
committerPekka Enberg <penberg@cs.helsinki.fi>2009-12-06 10:21:21 +0200
commit8e15b79cf4bd20c6afb4663d98a39cd004eee672 (patch)
tree07fd37869099565727a20ba85cb5b557c5e84fe8 /mm/slab.c
parentce79ddc8e2376a9a93c7d42daf89bfcbb9187e62 (diff)
downloadlinux-8e15b79cf4bd20c6afb4663d98a39cd004eee672.tar.gz
SLAB: Fix unlikely() annotation in __cache_alloc_node()
Branch profiling on my nehalem machine showed 99% incorrect branch hints:

   28459  7678524  99 __cache_alloc_node             slab.c               3551

Discussion on lkml [1] led to the solution to remove this hint.

[1] http://patchwork.kernel.org/patch/63517/

Signed-off-by: Tim Blechmann <tim@klingt.org>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Diffstat (limited to 'mm/slab.c')
-rw-r--r--mm/slab.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/slab.c b/mm/slab.c
index 84de47e350dd..a07540e5843b 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -3320,7 +3320,7 @@ __cache_alloc_node(struct kmem_cache *cachep, gfp_t flags, int nodeid,
 	cache_alloc_debugcheck_before(cachep, flags);
 	local_irq_save(save_flags);
 
-	if (unlikely(nodeid == -1))
+	if (nodeid == -1)
 		nodeid = numa_node_id();
 
 	if (unlikely(!cachep->nodelists[nodeid])) {