From d5b066e2a505f3dca75adff698d4b6d7635bf4ac Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 29 Aug 2012 11:35:00 -0700
Subject: [PATCH] --- yaml --- r: 322349 b: refs/heads/master c:
 a7ccbcf3307022c48810eebd99aa8dba84f13caf h: refs/heads/master i:   322347:
 a86f898c8fd673115bbd13d5a5760ae1658b59c0 v: v3

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

diff --git a/[refs] b/[refs]
index 894245f8691e..a31c1e4e2996 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e5531caffcc07b67452c4a8170ffb4c2bd1c9b7
+refs/heads/master: a7ccbcf3307022c48810eebd99aa8dba84f13caf
diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c
index f8b0d539b482..811af03a14ef 100644
--- a/trunk/mm/slab.c
+++ b/trunk/mm/slab.c
@@ -3260,6 +3260,7 @@ static void *cache_alloc_refill(struct kmem_cache *cachep, gfp_t flags,
 
 		/* cache_grow can reenable interrupts, then ac could change. */
 		ac = cpu_cache_get(cachep);
+		node = numa_mem_id();
 
 		/* no objects in sight? abort */
 		if (!x && (ac->avail == 0 || force_refill))