---
 mm/page_alloc.c |    2 +-
 mm/slub.c       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: linux-2.6/mm/page_alloc.c
===================================================================
--- linux-2.6.orig/mm/page_alloc.c	2009-10-29 15:41:21.000000000 -0500
+++ linux-2.6/mm/page_alloc.c	2009-10-29 15:41:43.000000000 -0500
@@ -3206,7 +3206,7 @@ void zone_pcp_update(struct zone *zone)
 static __meminit void zone_pcp_init(struct zone *zone)
 {
 	/* Use boot pagesets until we have the per cpu allocator up */
-	zone->pageset = &per_cpu_var(boot_pageset);
+	zone->pageset = &boot_pageset;
 
 	if (zone->present_pages)
 		printk(KERN_DEBUG "  %s zone: %lu pages, LIFO batch:%u\n",
Index: linux-2.6/mm/slub.c
===================================================================
--- linux-2.6.orig/mm/slub.c	2009-10-29 15:42:08.000000000 -0500
+++ linux-2.6/mm/slub.c	2009-10-29 15:42:36.000000000 -0500
@@ -2069,7 +2069,7 @@ static inline int alloc_kmem_cache_cpus(
 		 * 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);