From 6b05cfb170fec6bcbfedf37137bca5d9eed72f22 Mon Sep 17 00:00:00 2001
From: Joe Korty <joe.korty@ccur.com>
Date: Wed, 5 Mar 2008 15:04:59 -0800
Subject: [PATCH] --- yaml --- r: 87053 b: refs/heads/master c:
 6d2144d355d2a532e5cc3fc12a6ba2a8d4ef15e4 h: refs/heads/master i:   87051:
 eb0ed7671a8c09194a25fa0efe9450a9beffdb2e v: v3

---
 [refs]          | 2 +-
 trunk/mm/slab.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 9d6b3db21b1e..a9e52e9cc3e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b6210386787728b84db25adc4f1eba70440a4c73
+refs/heads/master: 6d2144d355d2a532e5cc3fc12a6ba2a8d4ef15e4
diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c
index f7faff72cf56..e6c698f55674 100644
--- a/trunk/mm/slab.c
+++ b/trunk/mm/slab.c
@@ -2964,11 +2964,10 @@ static void *cache_alloc_refill(struct kmem_cache *cachep, gfp_t flags)
 	struct array_cache *ac;
 	int node;
 
-	node = numa_node_id();
-
+retry:
 	check_irq_off();
+	node = numa_node_id();
 	ac = cpu_cache_get(cachep);
-retry:
 	batchcount = ac->batchcount;
 	if (!ac->touched && batchcount > BATCHREFILL_LIMIT) {
 		/*