PM: Drop pm_flags that is not necessary
The variable pm_flags is used to prevent APM from being enabled along with ACPI, which would lead to problems. However, acpi_init() is always called before apm_init() and after acpi_init() has returned, it is known whether or not ACPI will be used. Namely, if acpi_disabled is not set after acpi_init() has returned, this means that ACPI is enabled. Thus, it is sufficient to check acpi_disabled in apm_init() to prevent APM from being enabled in parallel with ACPI. Signed-off-by:Rafael J. Wysocki <rjw@sisk.pl> Acked-by:
Len Brown <len.brown@intel.com>
Showing
- arch/x86/kernel/apm_32.c 2 additions, 3 deletionsarch/x86/kernel/apm_32.c
- drivers/acpi/bus.c 5 additions, 17 deletionsdrivers/acpi/bus.c
- include/linux/pm.h 0 additions, 9 deletionsinclude/linux/pm.h
- include/linux/suspend.h 0 additions, 6 deletionsinclude/linux/suspend.h
- kernel/power/main.c 0 additions, 13 deletionskernel/power/main.c
Loading
Please register or sign in to comment