diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-03-16 14:48:05 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-03-16 14:48:05 +0100 |
| commit | 34e72afe73c40d9974c1f230c3b62fc43f5c5b28 (patch) | |
| tree | fee2be2e3453e246ee55ffb711a36a8ec053361a /mm/page_alloc.c | |
| parent | ALSA: control: Fix breakage of user ctl element addition (diff) | |
| parent | ALSA: hda - Treat stereo-to-mono mix properly (diff) | |
| download | linux-34e72afe73c40d9974c1f230c3b62fc43f5c5b28.tar.xz linux-34e72afe73c40d9974c1f230c3b62fc43f5c5b28.zip | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'mm/page_alloc.c')
| -rw-r--r-- | mm/page_alloc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 7abfa70cdc1a..40e29429e7b0 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -2373,7 +2373,8 @@ __alloc_pages_may_oom(gfp_t gfp_mask, unsigned int order, goto out; } /* Exhausted what can be done so it's blamo time */ - if (out_of_memory(ac->zonelist, gfp_mask, order, ac->nodemask, false)) + if (out_of_memory(ac->zonelist, gfp_mask, order, ac->nodemask, false) + || WARN_ON_ONCE(gfp_mask & __GFP_NOFAIL)) *did_some_progress = 1; out: oom_zonelist_unlock(ac->zonelist, gfp_mask); |