From 12e2fb37f6ec4879fa1eb3e613d5b9028cd1ecd4 Mon Sep 17 00:00:00 2001
From: David Rientjes <rientjes@google.com>
Date: Tue, 28 Aug 2012 19:57:21 -0700
Subject: [PATCH] --- yaml --- r: 322346 b: refs/heads/master c:
 51cd8e6ff265650e35e46b5bcbe2ee381a7a2877 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 004fdc43f97d..2c02a99db789 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c182ae42cc3611f7b3fa803c0bcab6e5d29bea63
+refs/heads/master: 51cd8e6ff265650e35e46b5bcbe2ee381a7a2877
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))