Commit 1154fab7 authored Mar 01, 2010 by Stephen Rothwell Committed by Pekka Enberg Mar 04, 2010

SLUB: Fix per-cpu merge conflict



The slab tree adds a percpu variable usage case (commit
9dfc6e68 "SLUB: Use this_cpu operations in
slub"), but the percpu tree removes the prefixing of percpu variables (commit
dd17c8f7 "percpu: remove per_cpu__ prefix"),
thus causing the following compilation error:

    CC      mm/slub.o
  mm/slub.c: In function ‘alloc_kmem_cache_cpus’:
  mm/slub.c:2078: error: implicit declaration of function ‘per_cpu_var’
  mm/slub.c:2078: warning: assignment makes pointer from integer without a cast
  make[1]: *** [mm/slub.o] Error 1

Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>

parent e2b093f3

mm/slub.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

Admin message