Commit:     8a0bb7362587807fec985f72fb0317aa8ed24835
Parent:     bbf25010f1a6b761914430f5fca081ec8c7accd1
Author:     Rafael J. Wysocki <[EMAIL PROTECTED]>
AuthorDate: Tue Oct 2 13:24:08 2007 -0700
Committer:  Len Brown <[EMAIL PROTECTED]>
CommitDate: Wed Oct 10 00:23:09 2007 -0400

    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
    Signed-off-by: Rafael J. Wysocki <[EMAIL PROTECTED]>
    Acked-by: Pavel Machek <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Len Brown <[EMAIL PROTECTED]>
 drivers/acpi/sleep/main.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
index 2cbb9aa..caf8721 100644
--- a/drivers/acpi/sleep/main.c
+++ b/drivers/acpi/sleep/main.c
@@ -256,6 +256,11 @@ static int acpi_hibernation_enter(void)
 static void acpi_hibernation_finish(void)
+       /*
+        * If ACPI is not enabled by the BIOS and the boot kernel, we need to
+        * enable it here.
+        */
+       acpi_enable();
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to