summaryrefslogtreecommitdiffstats
path: root/kernel/power
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-07-23 01:00:36 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-07-23 01:00:36 +0200
commit28cb5ef16e578bbca0a562b09f12c8c98ca92720 (patch)
tree823c538d2404323cd493dedcde08d41e166f8894 /kernel/power
parentLinux 3.16-rc6 (diff)
downloadlinux-28cb5ef16e578bbca0a562b09f12c8c98ca92720.tar.xz
linux-28cb5ef16e578bbca0a562b09f12c8c98ca92720.zip
PM: Create PM workqueue if runtime PM is not configured too
The PM workqueue is going to be used by ACPI PM notify handlers regardless of whether or not runtime PM is configured, so move it out of #ifdef CONFIG_PM_RUNTIME. Do that in three places in the ACPI device PM code. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'kernel/power')
-rw-r--r--kernel/power/main.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/kernel/power/main.c b/kernel/power/main.c
index 8e90f330f139..a18efed75fa7 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -615,7 +615,6 @@ static struct attribute_group attr_group = {
.attrs = g,
};
-#ifdef CONFIG_PM_RUNTIME
struct workqueue_struct *pm_wq;
EXPORT_SYMBOL_GPL(pm_wq);
@@ -625,9 +624,6 @@ static int __init pm_start_workqueue(void)
return pm_wq ? 0 : -ENOMEM;
}
-#else
-static inline int pm_start_workqueue(void) { return 0; }
-#endif
static int __init pm_init(void)
{