Hibernation: Make sure that ACPI is enabled in acpi_hibernation_finish
authorRafael J. Wysocki <rjw@sisk.pl>
Tue, 2 Oct 2007 20:24:08 +0000 (13:24 -0700)
committerLen Brown <len.brown@intel.com>
Wed, 10 Oct 2007 04:23:09 +0000 (00:23 -0400)
commit8a0bb7362587807fec985f72fb0317aa8ed24835
treea7ca52aeb218b5207349d93ffcf1fec49356bdb9
parentbbf25010f1a6b761914430f5fca081ec8c7accd1
Hibernation: Make sure that ACPI is enabled in acpi_hibernation_finish

If the BIOS does not enable ACPI and the "acpi=off" command line parameter
is passed to the boot kernel, ACPI may be disabled when the (restored)
image kernel attempts to execute acpi_hibernation_finish().  To prevent
this from happening we can call acpi_enable() from
acpi_hibernation_finish() (if ACPI is already enabled, this will have no
effect).

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: Len Brown <len.brown@intel.com>
drivers/acpi/sleep/main.c