Hibernation: Check if ACPI is enabled during restore in the right place
authorRafael J. Wysocki <rjw@sisk.pl>
Thu, 18 Oct 2007 10:04:55 +0000 (03:04 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 18 Oct 2007 21:37:20 +0000 (14:37 -0700)
commitc7e0831d385d620a58d95b25e4afa9b643f9a411
treed3dde7c47276aeb6fad0a1f25fa6b74cc5dacfc1
parentefa4d2fb047b25a6be67fe92178a2a78da6b3f6a
Hibernation: Check if ACPI is enabled during restore in the right place

The following scenario leads to total confusion of the platform firmware on
some boxes (eg. HPC nx6325):
* Hibernate with ACPI enabled
* Resume passing "acpi=off" to the boot kernel

To prevent this from happening it's necessary to check if ACPI is enabled (and
enable it if that's not the case) _right_ _after_ control has been transfered
from the boot kernel to the image kernel, before device_power_up() is called
(ie.  with interrupts disabled).   Enabling ACPI after calling
device_power_up() turns out to be insufficient.

For this reason, introduce new hibernation callback ->leave() that will be
executed before device_power_up() by the restored image kernel.   To make it
work, it also is necessary to move swsusp_suspend() from swsusp.c to disk.c
(it's name is changed to "create_image", which is more up to the point).

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/acpi/sleep/main.c
include/linux/suspend.h
kernel/power/disk.c
kernel/power/power.h
kernel/power/swsusp.c