padata: avoid race in reordering

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / kernel / freezer.c

diff --git a/kernel/freezer.c b/kernel/freezer.c
index c38893b0efbaa39d770b11546dba9e97ec53ff51..bd733f6e610d053fbe857aca9828a9c9a8e30706 100644 (file)
--- a/kernel/freezer.c
+++ b/kernel/freezer.c
@@ -19,6 +19,12 @@ EXPORT_SYMBOL(system_freezing_cnt);
 bool pm_freezing;
 bool pm_nosig_freezing;
 
+/*
+ * Temporary export for the deadlock workaround in ata_scsi_hotplug().
+ * Remove once the hack becomes unnecessary.
+ */
+EXPORT_SYMBOL_GPL(pm_freezing);
+
 /* protects freezing and frozen transitions */
 static DEFINE_SPINLOCK(freezer_lock);
 
@@ -36,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;