diff options
| author | Mark Brown <broonie@kernel.org> | 2014-11-14 18:07:40 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-11-14 18:07:40 +0000 |
| commit | 24a92c14505e9768d206ba8133054298d64103e6 (patch) | |
| tree | 721bffa213dd8faff305b44dd8bfc1fa4af81c45 /mm/page_alloc.c | |
| parent | 71b34fd1db384bb37b092bd6d0cf1b6be4fc7c26 (diff) | |
| parent | 8eb52971d4749c0192358e1942ca83d8dc7e686b (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Diffstat (limited to 'mm/page_alloc.c')
| -rw-r--r-- | mm/page_alloc.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 83fa999d1de1..025ebfc6d5a7 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -2133,6 +2133,14 @@ __alloc_pages_may_oom(gfp_t gfp_mask, unsigned int order, } /* + * PM-freezer should be notified that there might be an OOM killer on + * its way to kill and wake somebody up. This is too early and we might + * end up not killing anything but false positives are acceptable. + * See freeze_processes. + */ + note_oom_kill(); + + /* * Go through the zonelist yet one more time, keep very high watermark * here, this is only to catch a parallel oom killing, we must fail if * we're still under heavy pressure. |