---

yaml --- r: 64263 b: refs/heads/master c: a2f92ee h: refs/heads/master i: 64261: 42ae589 64259: 94fbebf 64255: 4024b62 v: v3
git-mirror · Aug 23, 2007 · df7a779 · df7a779
1 parent 539c144
commit df7a779
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9e86943b6c74f214ce0516d56e55636d52252e19
+refs/heads/master: a2f92ee7e704440995cf5474f4cc7b268bf380e0
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
@@ -1877,9 +1877,16 @@ static struct kmem_cache_node * __init early_kmem_cache_node_alloc(gfp_t gfpflag
 
 	BUG_ON(kmalloc_caches->size < sizeof(struct kmem_cache_node));
 
-	page = new_slab(kmalloc_caches, gfpflags | GFP_THISNODE, node);
+	page = new_slab(kmalloc_caches, gfpflags, node);
 
 	BUG_ON(!page);
+	if (page_to_nid(page) != node) {
+		printk(KERN_ERR "SLUB: Unable to allocate memory from "
+				"node %d\n", node);
+		printk(KERN_ERR "SLUB: Allocating a useless per node structure "
+				"in order to be able to continue\n");
+	}
+
 	n = page->freelist;
 	BUG_ON(!n);
 	page->freelist = get_freepointer(kmalloc_caches, n);