Merge branch 'x86/mm' into x86/boot, to pick up dependencies

Signed-off-by: Ingo Molnar <[email protected]>
This commit is contained in:
Ingo Molnar 2016-07-08 17:27:47 +02:00
commit 9e7f7f5425
727 changed files with 6789 additions and 3938 deletions

View file

@ -146,6 +146,18 @@ int freeze_processes(void)
if (!error && !oom_killer_disable())
error = -EBUSY;
/*
* There is a hard to fix race between oom_reaper kernel thread
* and oom_killer_disable. oom_reaper calls exit_oom_victim
* before the victim reaches exit_mm so try to freeze all the tasks
* again and catch such a left over task.
*/
if (!error) {
pr_info("Double checking all user space processes after OOM killer disable... ");
error = try_to_freeze_tasks(true);
pr_cont("\n");
}
if (error)
thaw_processes();
return error;