diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2007-03-16 17:38:06 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-16 22:25:03 -0400 |
commit | 94985134b7b46848267ed6b734320db01c974e72 (patch) | |
tree | 2ed8e5fd6c94a50b4dfb4c899305af04f2e3094d /kernel/power/disk.c | |
parent | 886c5952950ffed0e8ca3eb9efdc2728bfc144d3 (diff) |
[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/disk.c')
-rw-r--r-- | kernel/power/disk.c | 1 |
1 files changed, 1 insertions, 0 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) | |||
58 | 58 | ||
59 | static void power_down(suspend_disk_method_t mode) | 59 | static void power_down(suspend_disk_method_t mode) |
60 | { | 60 | { |
61 | disable_nonboot_cpus(); | ||
61 | switch(mode) { | 62 | switch(mode) { |
62 | case PM_DISK_PLATFORM: | 63 | case PM_DISK_PLATFORM: |
63 | if (pm_ops && pm_ops->enter) { | 64 | if (pm_ops && pm_ops->enter) { |