path: root/kernel/power/pm.c
diff options
authorLen Brown <len.brown@intel.com>2007-12-13 17:38:03 -0500
committerLen Brown <len.brown@intel.com>2008-01-11 12:26:47 -0500
commit9f9adecd2d0e4f88fa0e8cb06c6ec207748df70a (patch)
treeb3914860b74a9f6c3ae42016aa708b54040248f8 /kernel/power/pm.c
parentda8cadb31b82c9d41fc593c8deab6aa20b162d6b (diff)
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/pm.c')
1 files changed, 0 insertions, 4 deletions
diff --git a/kernel/power/pm.c b/kernel/power/pm.c
index c50d15266c10..60c73fa670d5 100644
--- a/kernel/power/pm.c
+++ b/kernel/power/pm.c
@@ -27,8 +27,6 @@
#include <linux/interrupt.h>
#include <linux/mutex.h>
-int pm_active;
* Locking notes:
* pm_devs_lock can be a semaphore providing pm ops are not called
@@ -204,6 +202,4 @@ int pm_send_all(pm_request_t rqst, void *data)

Privacy Policy