Merge back earlier suspend/hibernation changes for v4.8.

[cascardo/linux.git] / kernel / power / process.c

diff --git a/kernel/power/process.c b/kernel/power/process.c
index 6eef250..8f27d5a 100644 (file)
--- a/kernel/power/process.c
+++ b/kernel/power/process.c
@@ -149,6 +149,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;