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>
This commit is contained in:
@ -4,10 +4,6 @@
|
||||
|
||||
#ifdef CONFIG_PM_LEGACY
|
||||
|
||||
extern int pm_active;
|
||||
|
||||
#define PM_IS_ACTIVE() (pm_active != 0)
|
||||
|
||||
/*
|
||||
* Register a device with power management
|
||||
*/
|
||||
@ -21,8 +17,6 @@ int __deprecated pm_send_all(pm_request_t rqst, void *data);
|
||||
|
||||
#else /* CONFIG_PM_LEGACY */
|
||||
|
||||
#define PM_IS_ACTIVE() 0
|
||||
|
||||
static inline struct pm_dev *pm_register(pm_dev_t type,
|
||||
unsigned long id,
|
||||
pm_callback callback)
|
||||
|
Reference in New Issue
Block a user