diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2007-03-16 22:38:06 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-17 03:25:03 +0100 |
| commit | 94985134b7b46848267ed6b734320db01c974e72 (patch) | |
| tree | 2ed8e5fd6c94a50b4dfb4c899305af04f2e3094d /kernel/power | |
| parent | [PATCH] swsusp: Fix resume error path in platform mode (diff) | |
| download | linux-94985134b7b46848267ed6b734320db01c974e72.tar.xz linux-94985134b7b46848267ed6b734320db01c974e72.zip | |
[PATCH] swsusp: disable nonboot CPUs before entering platform suspend
Prevent the WARN_ON() in arch/x86_64/kernel/acpi/sleep.c:init_low_mapping()
from triggering by disabling nonboot CPUs before we finally enter the
platform suspend.
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')
| -rw-r--r-- | kernel/power/disk.c | 1 | ||||
| -rw-r--r-- | kernel/power/user.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/kernel/power/disk.c b/kernel/power/disk.c index a200c5fc42ee..873cdf8ea5a4 100644 --- a/kernel/power/disk.c +++ b/kernel/power/disk.c @@ -58,6 +58,7 @@ static inline int platform_prepare(void) static void power_down(suspend_disk_method_t mode) { + disable_nonboot_cpus(); switch(mode) { case PM_DISK_PLATFORM: if (pm_ops && pm_ops->enter) { diff --git a/kernel/power/user.c b/kernel/power/user.c index dd09efe7df54..d6a8dcc26ae5 100644 --- a/kernel/power/user.c +++ b/kernel/power/user.c @@ -398,9 +398,10 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp, case PMOPS_ENTER: if (data->platform_suspend) { + disable_nonboot_cpus(); kernel_shutdown_prepare(SYSTEM_SUSPEND_DISK); error = pm_ops->enter(PM_SUSPEND_DISK); - error = 0; + enable_nonboot_cpus(); } break; |