From abbb8b7e75b861e5ef63d0c4180feda6355f325f Mon Sep 17 00:00:00 2001
From: Tim Blechmann <tim@klingt.org>
Date: Mon, 30 Nov 2009 18:59:34 +0100
Subject: [PATCH] --- yaml --- r: 175598 b: refs/heads/master c:
 8e15b79cf4bd20c6afb4663d98a39cd004eee672 h: refs/heads/master v: v3

---
 [refs]          | 2 +-
 trunk/mm/slab.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f8b3c71f3a25..8e48f409a88d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce79ddc8e2376a9a93c7d42daf89bfcbb9187e62
+refs/heads/master: 8e15b79cf4bd20c6afb4663d98a39cd004eee672
diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c
index 84de47e350dd..a07540e5843b 100644
--- a/trunk/mm/slab.c
+++ b/trunk/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])) {