tree bd16d092edccbedf8c1fb5ad0baea0f89276ac71
parent 6c961dfb7c903cfd1cd71b506863894038fd704f
author Rafael J. Wysocki <rjw@sisk.pl> 1184834859 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1184864682 -0700

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>