summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2011-02-11 00:04:52 +0100
committerRafael J. Wysocki <rjw@sisk.pl>2011-03-15 00:43:15 +0100
commitcd51e61cf4e8b220da37dc35e9c2dc2dc258b4de (patch)
treef2cb7a54e59b0bc238ac14f226214e0fc0817891 /kernel
parentcb8f51bdadb7969139c2e39c2defd4cde98c1ea8 (diff)
downloadop-kernel-dev-cd51e61cf4e8b220da37dc35e9c2dc2dc258b4de.zip
op-kernel-dev-cd51e61cf4e8b220da37dc35e9c2dc2dc258b4de.tar.gz
PM / ACPI: Remove references to pm_flags from bus.c
If direct references to pm_flags are removed from drivers/acpi/bus.c, CONFIG_ACPI will not need to depend on CONFIG_PM any more. Make that happen. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Acked-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/power/main.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/kernel/power/main.c b/kernel/power/main.c
index 7018530..b5405af 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -17,10 +17,20 @@
DEFINE_MUTEX(pm_mutex);
+#ifdef CONFIG_PM_SLEEP
+
unsigned int pm_flags;
EXPORT_SYMBOL(pm_flags);
-#ifdef CONFIG_PM_SLEEP
+bool pm_apm_enabled(void)
+{
+ return !!(pm_flags & PM_APM);
+}
+
+void pm_set_acpi_flag(void)
+{
+ pm_flags |= PM_ACPI;
+}
/* Routines for PM-transition notifications */
OpenPOWER on IntegriCloud