diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-10-23 23:02:45 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-10-23 23:02:45 +0200 |
| commit | 96ed753235c674a8cb261dac1a258cf6e50c6cd4 (patch) | |
| tree | f9210625db82644ebcf88d1879288b2fc389d211 /mm/page_alloc.c | |
| parent | Merge branch 'pm-qos' (diff) | |
| parent | PM / freezer: Clean up code after recent fixes (diff) | |
| download | wireguard-linux-96ed753235c674a8cb261dac1a258cf6e50c6cd4.tar.xz wireguard-linux-96ed753235c674a8cb261dac1a258cf6e50c6cd4.zip | |
Merge branch 'freezer'
* freezer:
PM / freezer: Clean up code after recent fixes
PM: convert do_each_thread to for_each_process_thread
OOM, PM: OOM killed task shouldn't escape PM suspend
freezer: remove obsolete comments in __thaw_task()
freezer: Do not freeze tasks killed by OOM killer
Diffstat (limited to '')
| -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 736d8e1b6381..9cd36b822444 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -2252,6 +2252,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. |