Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ACPI: Do not prepare for hibernation in acpi_shutdown

Since we are now explicitly calling hibernation_ops->prepare() before
hibernation_ops->enter() in hibernation_platform_enter() (defined in
kernel/power/disk.c), ACPI should not call acpi_sleep_prepare(ACPI_STATE_S4)
from acpi_shutdown().

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@ucw.cz>
Cc: Len Brown <lenb@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Rafael J. Wysocki and committed by
Linus Torvalds
d7372cdf 6c961dfb

-3
-3
drivers/acpi/sleep/poweroff.c
··· 54 54 case SYSTEM_POWER_OFF: 55 55 /* Prepare to power off the system */ 56 56 return acpi_sleep_prepare(ACPI_STATE_S5); 57 - case SYSTEM_SUSPEND_DISK: 58 - /* Prepare to suspend the system to disk */ 59 - return acpi_sleep_prepare(ACPI_STATE_S4); 60 57 default: 61 58 return 0; 62 59 }