diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2007-10-18 12:04:55 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-18 23:37:20 +0200 |
| commit | c7e0831d385d620a58d95b25e4afa9b643f9a411 (patch) | |
| tree | d3dde7c47276aeb6fad0a1f25fa6b74cc5dacfc1 /kernel/power/power.h | |
| parent | Hibernation: Use temporary page tables for kernel text mapping on x86_64 (diff) | |
| download | linux-c7e0831d385d620a58d95b25e4afa9b643f9a411.tar.xz linux-c7e0831d385d620a58d95b25e4afa9b643f9a411.zip | |
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>
Diffstat (limited to 'kernel/power/power.h')
| -rw-r--r-- | kernel/power/power.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/power/power.h b/kernel/power/power.h index a0204dfc6c4c..195dc4611764 100644 --- a/kernel/power/power.h +++ b/kernel/power/power.h @@ -183,7 +183,6 @@ extern int swsusp_swap_in_use(void); extern int swsusp_check(void); extern int swsusp_shrink_memory(void); extern void swsusp_free(void); -extern int swsusp_suspend(void); extern int swsusp_resume(void); extern int swsusp_read(unsigned int *flags_p); extern int swsusp_write(unsigned int flags); |