]> err.no Git - linux-2.6/commit
PM: ACPI and APM must not be enabled at the same time
authorLen Brown <len.brown@intel.com>
Thu, 13 Dec 2007 22:38:03 +0000 (17:38 -0500)
committerLen Brown <len.brown@intel.com>
Fri, 11 Jan 2008 17:26:47 +0000 (12:26 -0500)
commit9f9adecd2d0e4f88fa0e8cb06c6ec207748df70a
treeb3914860b74a9f6c3ae42016aa708b54040248f8
parentda8cadb31b82c9d41fc593c8deab6aa20b162d6b
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>
arch/x86/kernel/apm_32.c
drivers/acpi/bus.c
include/linux/pm.h
include/linux/pm_legacy.h
kernel/power/main.c
kernel/power/pm.c