Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 123463
b: refs/heads/master
c: 0094de9
h: refs/heads/master
i:
  123461: 7942bd5
  123459: 75a0286
  123455: 683f940
v: v3
  • Loading branch information
David Rientjes authored and Pekka Enberg committed Nov 26, 2008
1 parent 2c75c70 commit c94eaa2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 249b9f331ec162af5a1fdb80f90cce77c2043985
refs/heads/master: 0094de92a4f1da3a845ccc4ecb12ec0db8e48997
7 changes: 2 additions & 5 deletions trunk/mm/slub.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit c94eaa2

Please sign in to comment.