summaryrefslogtreecommitdiffstats
path: root/kernel/power/main.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-12-13 23:38:03 +0100
committerLen Brown <len.brown@intel.com>2008-01-11 18:26:47 +0100
commit9f9adecd2d0e4f88fa0e8cb06c6ec207748df70a (patch)
treeb3914860b74a9f6c3ae42016aa708b54040248f8 /kernel/power/main.c
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff)
downloadlinux-9f9adecd2d0e4f88fa0e8cb06c6ec207748df70a.tar.xz
linux-9f9adecd2d0e4f88fa0e8cb06c6ec207748df70a.zip
PM: ACPI and APM must not be enabled at the same time
ACPI and APM used "pm_active" to guarantee that they would not be simultaneously active. But pm_active was recently moved under CONFIG_PM_LEGACY, so that without CONFIG_PM_LEGACY, pm_active became a NOP -- allowing ACPI and APM to both be simultaneously enabled. This caused unpredictable results, including boot hangs. Further, the code under CONFIG_PM_LEGACY is scheduled for removal. So replace pm_active with pm_flags. pm_flags depends only on CONFIG_PM, which is present for both CONFIG_APM and CONFIG_ACPI. http://bugzilla.kernel.org/show_bug.cgi?id=9194 Signed-off-by: Len Brown <len.brown@intel.com> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'kernel/power/main.c')
-rw-r--r--kernel/power/main.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/power/main.c b/kernel/power/main.c
index 3cdf95b1dc92..f71c9504a5c5 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -28,6 +28,9 @@ BLOCKING_NOTIFIER_HEAD(pm_chain_head);
DEFINE_MUTEX(pm_mutex);
+unsigned int pm_flags;
+EXPORT_SYMBOL(pm_flags);
+
#ifdef CONFIG_SUSPEND
/* This is just an arbitrary number */