From c94eaa2d2c5f35db6289ac0daff8a0f2545fe074 Mon Sep 17 00:00:00 2001 From: David Rientjes Date: Tue, 25 Nov 2008 19:14:19 -0800 Subject: [PATCH] --- yaml --- r: 123463 b: refs/heads/master c: 0094de92a4f1da3a845ccc4ecb12ec0db8e48997 h: refs/heads/master i: 123461: 7942bd5e4de414a7cb55d00089dfcd4f5eca9dbc 123459: 75a0286760048ca6f4af0b12e051e9aa0860e86b 123455: 683f9405c935d80a46364b20cd84c75734ee3906 v: v3 --- [refs] | 2 +- trunk/mm/slub.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index ac71c5baa6f7..298157a01c0c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 249b9f331ec162af5a1fdb80f90cce77c2043985 +refs/heads/master: 0094de92a4f1da3a845ccc4ecb12ec0db8e48997 diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c index 8f4edacd082d..b6968899cb58 100644 --- a/trunk/mm/slub.c +++ b/trunk/mm/slub.c @@ -2077,8 +2077,7 @@ static inline int alloc_kmem_cache_cpus(struct kmem_cache *s, gfp_t flags) * when allocating for the kmalloc_node_cache. This is used for bootstrapping * memory on a fresh node that has no slab structures yet. */ -static struct kmem_cache_node *early_kmem_cache_node_alloc(gfp_t gfpflags, - int node) +static void early_kmem_cache_node_alloc(gfp_t gfpflags, int node) { struct page *page; struct kmem_cache_node *n; @@ -2116,7 +2115,6 @@ static struct kmem_cache_node *early_kmem_cache_node_alloc(gfp_t gfpflags, local_irq_save(flags); add_partial(n, page, 0); local_irq_restore(flags); - return n; } static void free_kmem_cache_nodes(struct kmem_cache *s) @@ -2148,8 +2146,7 @@ static int init_kmem_cache_nodes(struct kmem_cache *s, gfp_t gfpflags) n = &s->local_node; else { if (slab_state == DOWN) { - n = early_kmem_cache_node_alloc(gfpflags, - node); + early_kmem_cache_node_alloc(gfpflags, node); continue; } n = kmem_cache_alloc_node(kmalloc_caches,