diff options
| author |   Tejun Heo <tj@kernel.org> | 2014-01-16 09:44:34 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-01-16 09:44:34 -0500 |
| commit | 6e1af69780a4df749d28a129596ed576a0d7996c (patch) | |
| tree | 67f0dee7b39c006dc305d7273db8222633603abf /kernel | |
| parent | ARM: mvebu: update the SATA compatible string for Armada 370/XP (diff) | |
| parent | sata_sis: missing PM support (diff) | |
| download | wireguard-linux-6e1af69780a4df749d28a129596ed576a0d7996c.tar.xz wireguard-linux-6e1af69780a4df749d28a129596ed576a0d7996c.zip | |
Merge branch 'for-3.13-fixes' into for-3.14
A scheduled horkage patch will conflict with HORKAGE changes in
for-3.13-fixes. Pull in to avoid unnecessary merge conflicts.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/freezer.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/kernel/freezer.c b/kernel/freezer.c index b462fa197517..aa6a8aadb911 100644 --- 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); |