diff options
| author | Qiang Huang <h.huangqiang@huawei.com> | 2013-11-13 00:07:22 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-13 04:09:04 +0100 |
| commit | b9921ecdee66984b00c38c00a358ef3f611d2b50 (patch) | |
| tree | caf420f152f6c8764f150ad336645deec9acaeb2 /mm/page_alloc.c | |
| parent | mm/memory_hotplug.c: use pfn_to_nid() instead of page_to_nid(pfn_to_page()) (diff) | |
| download | linux-b9921ecdee66984b00c38c00a358ef3f611d2b50.tar.xz linux-b9921ecdee66984b00c38c00a358ef3f611d2b50.zip | |
mm: add a helper function to check may oom condition
Use helper function to check if we need to deal with oom condition.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Acked-by: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/page_alloc.c')
| -rw-r--r-- | mm/page_alloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 3d1d75a6629f..e0412c026e0d 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -2593,7 +2593,7 @@ rebalance: * running out of options and have to consider going OOM */ if (!did_some_progress) { - if ((gfp_mask & __GFP_FS) && !(gfp_mask & __GFP_NORETRY)) { + if (oom_gfp_allowed(gfp_mask)) { if (oom_killer_disabled) goto nopage; /* Coredumps can quickly deplete all memory reserves */ |