From 1c84a02658cc3990b232470dee3e3e85ace0f290 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 1 Mar 2010 16:04:45 +1100
Subject: [PATCH] --- yaml --- r: 186182 b: refs/heads/master c:
 1154fab73ccbab010cfaa272b6987c624cfd63c6 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index eb586de40638..4c9c217cd348 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e2b093f3e9262353558c6f89510ab2d286b28287
+refs/heads/master: 1154fab73ccbab010cfaa272b6987c624cfd63c6
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
index 3525a4ec9794..0bfd3863d521 100644
--- a/trunk/mm/slub.c
+++ b/trunk/mm/slub.c
@@ -2075,7 +2075,7 @@ static inline int alloc_kmem_cache_cpus(struct kmem_cache *s, gfp_t flags)
 		 * Boot time creation of the kmalloc array. Use static per cpu data
 		 * since the per cpu allocator is not available yet.
 		 */
-		s->cpu_slab = per_cpu_var(kmalloc_percpu) + (s - kmalloc_caches);
+		s->cpu_slab = kmalloc_percpu + (s - kmalloc_caches);
 	else
 		s->cpu_slab =  alloc_percpu(struct kmem_cache_cpu);