PM: ACPI and APM must not be enabled at the same time
authorLen Brown <len.brown@intel.com>
Mon, 14 Jan 2008 07:39:18 +0000 (02:39 -0500)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 8 Feb 2008 20:01:32 +0000 (12:01 -0800)
commit5a75ac5da4c601e146fc1becb6eefb6b21d67b09
tree7d62cba8925e694a7cec48722fdb8b5860b73d0b
parent6920e2dd9ead7131f75f71f40fb00655e18c7320
PM: ACPI and APM must not be enabled at the same time

patch 9f9adecd2d0e4f88fa0e8cb06c6ec207748df70a in mainline.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
arch/i386/kernel/apm.c
drivers/acpi/bus.c
include/linux/pm.h
include/linux/pm_legacy.h
kernel/power/main.c
kernel/power/pm.c