Merge branch 'drm-next-4.8' of git://people.freedesktop.org/~agd5f/linux into drm...

[deliverable/linux.git] / kernel / freezer.c

diff --git a/kernel/freezer.c b/kernel/freezer.c
index a8900a3bc27a895b65580a23a144e581bfe0149d..6f56a9e219facf003d802bd1e9c0cd2dea9824d3 100644 (file)
--- a/kernel/freezer.c
+++ b/kernel/freezer.c
@@ -42,7 +42,7 @@ bool freezing_slow_path(struct task_struct *p)
        if (p->flags & (PF_NOFREEZE | PF_SUSPEND_TASK))
                return false;
 
-       if (test_thread_flag(TIF_MEMDIE))
+       if (test_tsk_thread_flag(p, TIF_MEMDIE))
                return false;
 
        if (pm_nosig_freezing || cgroup_freezing(p))