leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Slub: UP bandaid"

Browse Source 
This reverts commit 5249d039500f05a5ab379286b1d23ab9b04d3f2c. It's not needed
after commit bbddff0545 ("percpu: use percpu
allocator on UP too").
This commit is contained in:
Pekka Enberg 2010-09-18 20:45:06 +03:00
parent ed6c1115c8
commit ed59ecbf89
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mm/slub.c
View File

@ -2104,24 +2104,8 @@ init_kmem_cache_node(struct kmem_cache_node *n, struct kmem_cache *s)
static inline int alloc_kmem_cache_cpus(struct kmem_cache *s) static inline int alloc_kmem_cache_cpus(struct kmem_cache *s)
{ {
#ifdef CONFIG_SMP
/*
* Will use reserve that does not require slab operation during
* early boot.
*/
BUILD_BUG_ON(PERCPU_DYNAMIC_EARLY_SIZE < BUILD_BUG_ON(PERCPU_DYNAMIC_EARLY_SIZE <
SLUB_PAGE_SHIFT * sizeof(struct kmem_cache_cpu)); SLUB_PAGE_SHIFT * sizeof(struct kmem_cache_cpu));
#else
/*
* Special hack for UP mode. allocpercpu() falls back to kmalloc
* operations. So we cannot use that before the slab allocator is up
* Simply get the smallest possible compound page. The page will be
* released via kfree() when the cpu caches are resized later.
*/
if (slab_state < UP)
s->cpu_slab = (__percpu void *)kmalloc_large(PAGE_SIZE << 1, GFP_NOWAIT);
else
#endif
s->cpu_slab = alloc_percpu(struct kmem_cache_cpu); s->cpu_slab = alloc_percpu(struct kmem_cache_cpu);