projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'backport/v3.14.24-ltsi-rc1/gpio-20141117' into backport/v3.14.24-ltsi...
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
kernel
/
freezer.c
diff --git
a/kernel/freezer.c
b/kernel/freezer.c
index
aa6a8aa
..
8f9279b
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 | PF_SUSPEND_TASK))
return false;
if (p->flags & (PF_NOFREEZE | PF_SUSPEND_TASK))
return false;
+ if (test_thread_flag(TIF_MEMDIE))
+ return false;
+
if (pm_nosig_freezing || cgroup_freezing(p))
return true;
if (pm_nosig_freezing || cgroup_freezing(p))
return true;