Skip to content
Commit 1154fab7 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Pekka Enberg
Browse files

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: default avatarPekka Enberg <penberg@cs.helsinki.fi>
parent e2b093f3
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment