Merge branch 'v3.10/topic/misc' into linux-linaro-lsk-v3.10

[firefly-linux-kernel-4.4.55.git] / kernel / freezer.c

diff --git a/kernel/freezer.c b/kernel/freezer.c
index 78758512b1e1ef6994bb91371e5bbe5e8a43e686..bd733f6e610d053fbe857aca9828a9c9a8e30706 100644 (file)
--- a/kernel/freezer.c
+++ b/kernel/freezer.c
@@ -42,6 +42,9 @@ bool freezing_slow_path(struct task_struct *p)
        if (p->flags & PF_NOFREEZE)
                return false;
 
+       if (test_thread_flag(TIF_MEMDIE))
+               return false;
+
        if (pm_nosig_freezing || cgroup_freezing(p))
                return true;