From 497a1c2ca90ac25373b0fe63f5ec5a0e67e6b1be Mon Sep 17 00:00:00 2001 From: Christoph Lameter Date: Fri, 20 Aug 2010 12:37:14 -0500 Subject: [PATCH] --- yaml --- r: 215935 b: refs/heads/master c: 6c182dc0de26ef97efb6a97a8deab074833764e7 h: refs/heads/master i: 215933: 7ed844001e4f1bb189e9b174faa3060b86dadd5f 215931: 8b03599b38e172ab1c534a42179354e7f27834b4 215927: 09120f8c4c30290efcd52b4eb2ece3d0c28b8d63 215919: 551cc68af72bab2769f4175fa06f3f1652b0cf6a 215903: f15d970c0719efc13e06b6e56f01af601447f7d9 215871: cc0808eb40609e5ec008cf8466ad6917acaefb21 215807: 499f63008a1eb2315bb21135f371b6266ef4f0b8 v: v3 --- [refs] | 2 +- trunk/mm/slub.c | 17 ++++------------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index 005aa10385e8..b14ecd4a7d3f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 55136592fedf5cc58c03d9b5eb66103a9013d4e5 +refs/heads/master: 6c182dc0de26ef97efb6a97a8deab074833764e7 diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c index 38c73a3364c6..e8c117595367 100644 --- a/trunk/mm/slub.c +++ b/trunk/mm/slub.c @@ -2062,23 +2062,14 @@ init_kmem_cache_node(struct kmem_cache_node *n, struct kmem_cache *s) #endif } -static DEFINE_PER_CPU(struct kmem_cache_cpu, kmalloc_percpu[KMALLOC_CACHES]); - static inline int alloc_kmem_cache_cpus(struct kmem_cache *s) { - if (s < kmalloc_caches + KMALLOC_CACHES && s >= kmalloc_caches) - /* - * Boot time creation of the kmalloc array. Use static per cpu data - * since the per cpu allocator is not available yet. - */ - s->cpu_slab = kmalloc_percpu + (s - kmalloc_caches); - else - s->cpu_slab = alloc_percpu(struct kmem_cache_cpu); + BUILD_BUG_ON(PERCPU_DYNAMIC_EARLY_SIZE < + SLUB_PAGE_SHIFT * sizeof(struct kmem_cache_cpu)); - if (!s->cpu_slab) - return 0; + s->cpu_slab = alloc_percpu(struct kmem_cache_cpu); - return 1; + return s->cpu_slab != NULL; } #ifdef CONFIG_NUMA