From: Rafael J. Wysocki <rjw@sisk.pl>
Date: Thu, 19 Jul 2007 08:47:39 +0000 (-0700)
Subject: ACPI: Do not prepare for hibernation in acpi_shutdown
X-Git-Tag: v2.6.23-rc1~451
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7372cdf6938ccea23ec9fc68970702fed9ec3c8;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed