aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorMika Westerberg <mika.westerberg@linux.intel.com>2019-10-04 06:00:25 -0400
committerJens Axboe <axboe@kernel.dk>2019-10-06 11:11:37 -0400
commit0e48f51cbbfbdb79149806de14dcb8bf0f01ca94 (patch)
tree61ddfe90317118824b15ae7cff539cb8f8232b62 /kernel
parenta2b90f11217790ec0964ba9c93a4abb369758c26 (diff)
Revert "libata, freezer: avoid block device removal while system is frozen"
This reverts commit 85fbd722ad0f5d64d1ad15888cd1eb2188bfb557. The commit was added as a quick band-aid for a hang that happened when a block device was removed during system suspend. Now that bdi_wq is not freezable anymore the hang should not be possible and we can get rid of this hack by reverting it. Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/freezer.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/kernel/freezer.c b/kernel/freezer.c
index c0738424bb43..dc520f01f99d 100644
--- a/kernel/freezer.c
+++ b/kernel/freezer.c
@@ -22,12 +22,6 @@ EXPORT_SYMBOL(system_freezing_cnt);
22bool pm_freezing; 22bool pm_freezing;
23bool pm_nosig_freezing; 23bool pm_nosig_freezing;
24 24
25/*
26 * Temporary export for the deadlock workaround in ata_scsi_hotplug().
27 * Remove once the hack becomes unnecessary.
28 */
29EXPORT_SYMBOL_GPL(pm_freezing);
30
31/* protects freezing and frozen transitions */ 25/* protects freezing and frozen transitions */
32static DEFINE_SPINLOCK(freezer_lock); 26static DEFINE_SPINLOCK(freezer_lock);
33 27