---

yaml --- r: 14046 b: refs/heads/master c: 50c85a1 h: refs/heads/master v: v3
git-mirror · Nov 14, 2005 · f904fa1 · f904fa1
1 parent bd870c0
commit f904fa1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git 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
@@ -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);