projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-3.13-fixes' into for-3.14
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
freezer.c
diff --git
a/kernel/freezer.c
b/kernel/freezer.c
index b462fa197517b6176701fa860cdb966bc44a69ba..aa6a8aadb911fb323b4662a4652c95ff4319f0c5 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;
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);
/* protects freezing and frozen transitions */
static DEFINE_SPINLOCK(freezer_lock);