diff options
| author | James Morris <jmorris@namei.org> | 2009-06-30 09:10:35 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-06-30 09:10:35 +1000 |
| commit | ac7242142b03421c96b0a2f8d99f146d075614c2 (patch) | |
| tree | b0b2ead65858c7a343d38affed86fe815e37e7e9 /mm/slub.c | |
| parent | 89c86576ecde504da1eeb4f4882b2189ac2f9c4a (diff) | |
| parent | 2bfdd79eaa0043346e773ba5f6cfd811ea31b73d (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'mm/slub.c')
| -rw-r--r-- | mm/slub.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/mm/slub.c b/mm/slub.c index ce62b770e2f..819f056b39c 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -1085,11 +1085,17 @@ static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node) { struct page *page; struct kmem_cache_order_objects oo = s->oo; + gfp_t alloc_gfp; flags |= s->allocflags; - page = alloc_slab_page(flags | __GFP_NOWARN | __GFP_NORETRY, node, - oo); + /* + * Let the initial higher-order allocation fail under memory pressure + * so we fall-back to the minimum order allocation. + */ + alloc_gfp = (flags | __GFP_NOWARN | __GFP_NORETRY) & ~__GFP_NOFAIL; + + page = alloc_slab_page(alloc_gfp, node, oo); if (unlikely(!page)) { oo = s->min; /* |