From df7a7792fc4f65845d3a3e650cd21b76aebf0e31 Mon Sep 17 00:00:00 2001
From: Christoph Lameter <clameter@sgi.com>
Date: Wed, 22 Aug 2007 14:01:57 -0700
Subject: [PATCH] --- yaml --- r: 64263 b: refs/heads/master c:
 a2f92ee7e704440995cf5474f4cc7b268bf380e0 h: refs/heads/master i:   64261:
 42ae589476184f86aeb3f7729244c71d1dd4ecb4   64259:
 94fbebf1204d2d29dad070624a30e9ed23d46052   64255:
 4024b621af56498fcaba69dcce0aabcd7ce79757 v: v3

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

diff --git a/[refs] b/[refs]
index 204568488020..0347a3c17a2c 100644
--- 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
index 0c106d73f9c5..04151da399c6 100644
--- 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);