mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-11-20 00:26:39 +08:00
SLUB: Fix per-cpu merge conflict
The slab tree adds a percpu variable usage case (commit9dfc6e68bf
"SLUB: Use this_cpu operations in slub"), but the percpu tree removes the prefixing of percpu variables (commitdd17c8f729
"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>
This commit is contained in:
parent
e2b093f3e9
commit
1154fab73c
@ -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);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user