The patch titled
Fix ThinkPad T42 poweroff failure by "PM: Introduce pm_power_off_prepare"
has been added to the -mm tree. Its filename is
fix-thinkpad-t42-poweroff-failure-by-pm-introduce-pm_power_off_prepare.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: Fix ThinkPad T42 poweroff failure by "PM: Introduce pm_power_off_prepare"
From: Rafael J. Wysocki <rjw@xxxxxxx>
Generally, sysdev_shutdown() should be called after the ACPI preparation for
powering the system off. To make it happen, we can separate sysdev_shutdown()
from device_shutdown() and call it directly wherever necessary.
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
Acked-by: YOSHIFUJI Hideaki <yoshfuji@xxxxxxxxxxxxxx>
Cc: Michal Piotrowski <michal.k.k.piotrowski@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/base/power/shutdown.c | 2 --
include/linux/device.h | 3 +++
kernel/power/disk.c | 1 +
kernel/sys.c | 3 +++
4 files changed, 7 insertions(+), 2 deletions(-)
diff -puN drivers/base/power/shutdown.c~fix-thinkpad-t42-poweroff-failure-by-pm-introduce-pm_power_off_prepare drivers/base/power/shutdown.c
--- a/drivers/base/power/shutdown.c~fix-thinkpad-t42-poweroff-failure-by-pm-introduce-pm_power_off_prepare
+++ a/drivers/base/power/shutdown.c
@@ -44,7 +44,5 @@ void device_shutdown(void)
dev->driver->shutdown(dev);
}
}
-
- sysdev_shutdown();
}
diff -puN include/linux/device.h~fix-thinkpad-t42-poweroff-failure-by-pm-introduce-pm_power_off_prepare include/linux/device.h
--- a/include/linux/device.h~fix-thinkpad-t42-poweroff-failure-by-pm-introduce-pm_power_off_prepare
+++ a/include/linux/device.h
@@ -551,6 +551,9 @@ extern void put_device(struct device * d
/* drivers/base/power/shutdown.c */
extern void device_shutdown(void);
+/* drivers/base/sys.c */
+extern void sysdev_shutdown(void);
+
/* drivers/base/firmware.c */
extern int __must_check firmware_register(struct kset *);
diff -puN kernel/power/disk.c~fix-thinkpad-t42-poweroff-failure-by-pm-introduce-pm_power_off_prepare kernel/power/disk.c
--- a/kernel/power/disk.c~fix-thinkpad-t42-poweroff-failure-by-pm-introduce-pm_power_off_prepare
+++ a/kernel/power/disk.c
@@ -216,6 +216,7 @@ int hibernation_platform_enter(void)
* sleep state after all
*/
error = hibernation_ops->prepare();
+ sysdev_shutdown();
if (!error)
error = hibernation_ops->enter();
} else {
diff -puN kernel/sys.c~fix-thinkpad-t42-poweroff-failure-by-pm-introduce-pm_power_off_prepare kernel/sys.c
--- a/kernel/sys.c~fix-thinkpad-t42-poweroff-failure-by-pm-introduce-pm_power_off_prepare
+++ a/kernel/sys.c
@@ -804,6 +804,7 @@ static void kernel_restart_prepare(char
blocking_notifier_call_chain(&reboot_notifier_list, SYS_RESTART, cmd);
system_state = SYSTEM_RESTART;
device_shutdown();
+ sysdev_shutdown();
}
/**
@@ -860,6 +861,7 @@ void kernel_shutdown_prepare(enum system
void kernel_halt(void)
{
kernel_shutdown_prepare(SYSTEM_HALT);
+ sysdev_shutdown();
printk(KERN_EMERG "System halted.\n");
machine_halt();
}
@@ -876,6 +878,7 @@ void kernel_power_off(void)
kernel_shutdown_prepare(SYSTEM_POWER_OFF);
if (pm_power_off_prepare)
pm_power_off_prepare();
+ sysdev_shutdown();
printk(KERN_EMERG "Power down.\n");
machine_power_off();
}
_
Patches currently in -mm which might be from rjw@xxxxxxx are
origin.patch
pm-fix-compiler-error-of-ppc-dart_iommu.patch
chipsfb-use-correct-pm-state.patch
fix-thinkpad-t42-poweroff-failure-by-pm-introduce-pm_power_off_prepare.patch
pm-move-definition-of-struct-pm_ops-to-suspendh.patch
pm-rename-struct-pm_ops-and-related-things.patch
pm-rework-struct-platform_suspend_ops.patch
pm-fix-compilation-of-suspend-code-if-config_pm-is-unset.patch
pm-make-suspend_ops-static.patch
pm-rework-struct-hibernation_ops.patch
pm-rename-hibernation_ops-to-platform_hibernation_ops.patch
freezer-document-relationship-with-memory-shrinking.patch
freezer-do-not-sync-filesystems-from-freeze_processes.patch
freezer-prevent-new-tasks-from-inheriting-tif_freeze-set.patch
freezer-introduce-freezer-firendly-waiting-macros.patch
freezer-do-not-send-signals-to-kernel-threads.patch
shrink_slab-handle-bad-shrinkers.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
