The patch titled
swsusp-disable-nonboot-cpus-before-entering-platform-suspend update
has been removed from the -mm tree. Its filename was
swsusp-disable-nonboot-cpus-before-entering-platform-suspend-update.patch
This patch was dropped because it was folded into swsusp-disable-nonboot-cpus-before-entering-platform-suspend.patch
------------------------------------------------------
Subject: swsusp-disable-nonboot-cpus-before-entering-platform-suspend update
From: "Rafael J. Wysocki" <rjw@xxxxxxx>
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
Acked-by: Pavel Machek <pavel@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/power/disk.c | 2 +-
kernel/power/user.c | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff -puN kernel/power/disk.c~swsusp-disable-nonboot-cpus-before-entering-platform-suspend-update kernel/power/disk.c
--- a/kernel/power/disk.c~swsusp-disable-nonboot-cpus-before-entering-platform-suspend-update
+++ a/kernel/power/disk.c
@@ -58,10 +58,10 @@ 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) {
- disable_nonboot_cpus();
kernel_shutdown_prepare(SYSTEM_SUSPEND_DISK);
pm_ops->enter(PM_SUSPEND_DISK);
break;
diff -puN kernel/power/user.c~swsusp-disable-nonboot-cpus-before-entering-platform-suspend-update kernel/power/user.c
--- a/kernel/power/user.c~swsusp-disable-nonboot-cpus-before-entering-platform-suspend-update
+++ a/kernel/power/user.c
@@ -401,6 +401,7 @@ static int snapshot_ioctl(struct inode *
disable_nonboot_cpus();
kernel_shutdown_prepare(SYSTEM_SUSPEND_DISK);
error = pm_ops->enter(PM_SUSPEND_DISK);
+ enable_nonboot_cpus();
}
break;
_
Patches currently in -mm which might be from rjw@xxxxxxx are
swsusp-fix-resume-error-path-in-platform-mode.patch
swsusp-disable-nonboot-cpus-before-entering-platform-suspend.patch
swsusp-disable-nonboot-cpus-before-entering-platform-suspend-update.patch
software-suspend-fix-suspend-when-console-is-in.patch
software-suspend-fix-suspend-when-console-is-in-tidy.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
