diff options
author | Pekka Enberg <penberg@cs.helsinki.fi> | 2009-06-11 09:18:09 -0400 |
---|---|---|
committer | Pekka Enberg <penberg@cs.helsinki.fi> | 2009-06-13 16:37:38 -0400 |
commit | 95f8598931bd86a5775073db2fa2004b892dd3d0 (patch) | |
tree | c315a6fb15b626c31c139519e099fec43a1bec2b /mm/slub.c | |
parent | 26c02cf05ddadfee3952e829b841583794bf46f6 (diff) |
SLUB: Don't print out OOM warning for __GFP_NOFAIL
We must check for __GFP_NOFAIL like the page allocator does; otherwise we end
up with false positives. While at it, add the printk_ratelimit() check in SLUB
as well.
Cc: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Diffstat (limited to 'mm/slub.c')
-rw-r--r-- | mm/slub.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1631,7 +1631,8 @@ new_slab: | |||
1631 | c->page = new; | 1631 | c->page = new; |
1632 | goto load_freelist; | 1632 | goto load_freelist; |
1633 | } | 1633 | } |
1634 | slab_out_of_memory(s, gfpflags, node); | 1634 | if (!(gfpflags & __GFP_NOWARN) && printk_ratelimit()) |
1635 | slab_out_of_memory(s, gfpflags, node); | ||
1635 | return NULL; | 1636 | return NULL; |
1636 | debug: | 1637 | debug: |
1637 | if (!alloc_debug_processing(s, c->page, object, addr)) | 1638 | if (!alloc_debug_processing(s, c->page, object, addr)) |