Messages in this thread | | | Date | Mon, 01 Mar 2010 17:17:02 +0200 | From | Pekka Enberg <> | Subject | Re: linux-next: current pending merge fix patches |
| |
Stephen Rothwell wrote: > 4) The slab[7] tree adds a percpu variable usage case (commit > 9dfc6e68bfe6ee452efb1a4e9ca26a9007f2b864 "SLUB: Use this_cpu operations in > slub"), but the percpu[8] tree removes the prefixing of percpu variables > (commit dd17c8f72993f9461e9c19250e3f155d6d99df22 "percpu: remove per_cpu__ > prefix"), thus the fooling patch after mergeing these trees: > > diff --git a/mm/slub.c b/mm/slub.c > index 6e34309..9e86e6b 100644 > --- a/mm/slub.c > +++ b/mm/slub.c > @@ -2071,7 +2071,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);
Thanks for the reminder Stephen! I'll add this to slab.git as soon as the per-cpu changes land into Linus' tree.
Pekka
| |