Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 261643
b: refs/heads/master
c: 7e0528d
h: refs/heads/master
i:
  261641: 3516d93
  261639: ff1e8d9
v: v3
  • Loading branch information
Christoph Lameter authored and Pekka Enberg committed Jul 2, 2011
1 parent 0f8d92a commit 99e7aa9
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 11 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: e4a46182e1bcc2ddacff5a35f6b52398b51f1b11
refs/heads/master: 7e0528dadc9f8b04e4de0dba48a075100c2afe75
23 changes: 13 additions & 10 deletions trunk/mm/slub.c
Original file line number Diff line number Diff line change
Expand Up @@ -1187,6 +1187,11 @@ static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node)
struct kmem_cache_order_objects oo = s->oo;
gfp_t alloc_gfp;

flags &= gfp_allowed_mask;

if (flags & __GFP_WAIT)
local_irq_enable();

flags |= s->allocflags;

/*
Expand All @@ -1203,12 +1208,17 @@ static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node)
* Try a lower order alloc if possible
*/
page = alloc_slab_page(flags, node, oo);
if (!page)
return NULL;

stat(s, ORDER_FALLBACK);
if (page)
stat(s, ORDER_FALLBACK);
}

if (flags & __GFP_WAIT)
local_irq_disable();

if (!page)
return NULL;

if (kmemcheck_enabled
&& !(s->flags & (SLAB_NOTRACK | DEBUG_DEFAULT_FLAGS))) {
int pages = 1 << oo_order(oo);
Expand Down Expand Up @@ -1849,15 +1859,8 @@ static void *__slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,
goto load_freelist;
}

gfpflags &= gfp_allowed_mask;
if (gfpflags & __GFP_WAIT)
local_irq_enable();

page = new_slab(s, gfpflags, node);

if (gfpflags & __GFP_WAIT)
local_irq_disable();

if (page) {
c = __this_cpu_ptr(s->cpu_slab);
stat(s, ALLOC_SLAB);
Expand Down

0 comments on commit 99e7aa9

Please sign in to comment.