From f904fa1811b10982308b8f436f2ec66d45676620 Mon Sep 17 00:00:00 2001
From: Christoph Lameter <clameter@engr.sgi.com>
Date: Sun, 13 Nov 2005 16:06:47 -0800
Subject: [PATCH] --- yaml --- r: 14046 b: refs/heads/master c:
 50c85a19e7b3928b5b5188524c44ffcbacdd4e35 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index ab0c4d56642d..652259fa1ca4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 065d41cb269e9debb18c6d5052e4de1088ae3d8f
+refs/heads/master: 50c85a19e7b3928b5b5188524c44ffcbacdd4e35
diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c
index 15d25ae5b686..e5ec26e0c460 100644
--- a/trunk/mm/slab.c
+++ b/trunk/mm/slab.c
@@ -1205,11 +1205,7 @@ static void *kmem_getpages(kmem_cache_t *cachep, gfp_t flags, int nodeid)
 	int i;
 
 	flags |= cachep->gfpflags;
-	if (likely(nodeid == -1)) {
-		page = alloc_pages(flags, cachep->gfporder);
-	} else {
-		page = alloc_pages_node(nodeid, flags, cachep->gfporder);
-	}
+	page = alloc_pages_node(nodeid, flags, cachep->gfporder);
 	if (!page)
 		return NULL;
 	addr = page_address(page);