summaryrefslogtreecommitdiffstats
path: root/kernel/sys.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2007-07-19 10:47:39 +0200
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-19 19:04:42 +0200
commitd7372cdf6938ccea23ec9fc68970702fed9ec3c8 (patch)
treebd16d092edccbedf8c1fb5ad0baea0f89276ac71 /kernel/sys.c
parentPM: Reduce code duplication between main.c and user.c (diff)
downloadlinux-d7372cdf6938ccea23ec9fc68970702fed9ec3c8.tar.xz
linux-d7372cdf6938ccea23ec9fc68970702fed9ec3c8.zip
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>
Diffstat (limited to 'kernel/sys.c')
0 files changed, 0 insertions, 0 deletions