The patch titled PM: Do not destroy/create devices while suspended in msr.c (rev. 2) has been added to the -mm tree. Its filename is pm-do-not-destroy-create-devices-while-suspended-in-msrc-rev-2.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** 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 The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: PM: Do not destroy/create devices while suspended in msr.c (rev. 2) From: Rafael J. Wysocki <rjw@xxxxxxx> The MSR driver should not attempt to destroy/create a device while suspended, unless this device corresponds to a nonboot CPU that failed to go online during a resume, in which case the PM core should be asked to remove it. Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx> Cc: Greg KH <greg@xxxxxxxxx> Cc: Kay Sievers <kay.sievers@xxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Andi Kleen <ak@xxxxxxx> Cc: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx> Cc: Len Brown <lenb@xxxxxxxxxx> Cc: Pavel Machek <pavel@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/x86/kernel/msr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff -puN arch/x86/kernel/msr.c~pm-do-not-destroy-create-devices-while-suspended-in-msrc-rev-2 arch/x86/kernel/msr.c --- a/arch/x86/kernel/msr.c~pm-do-not-destroy-create-devices-while-suspended-in-msrc-rev-2 +++ a/arch/x86/kernel/msr.c @@ -155,15 +155,15 @@ static int __cpuinit msr_class_cpu_callb switch (action) { case CPU_UP_PREPARE: - case CPU_UP_PREPARE_FROZEN: err = msr_device_create(cpu); break; case CPU_UP_CANCELED: - case CPU_UP_CANCELED_FROZEN: case CPU_DEAD: - case CPU_DEAD_FROZEN: msr_device_destroy(cpu); break; + case CPU_UP_CANCELED_FROZEN: + destroy_suspended_device(msr_class, MKDEV(MSR_MAJOR, cpu)); + break; } return err ? NOTIFY_BAD : NOTIFY_OK; } _ Patches currently in -mm which might be from rjw@xxxxxxx are reintroduce-run-time-configurable-max_cstate-for-cpu_idle-case.patch git-acpi.patch suspend-introduce-begin-and-end-callbacks.patch acpi-separate-invocations-of-_gts-and-_bfs-from-_pts-and-_wak.patch acpi-separate-disabling-of-gpes-from-_pts.patch acpi-suspend-call-_pts-before-suspending-devices.patch hibernation-introduce-begin-and-end-callbacks.patch acpi-hibernation-call-_pts-before-suspending-devices.patch acpi-print-message-before-calling-_pts.patch gregkh-driver-kset-convert-to-kobj_sysfs_ops-vs-git-acpi.patch pm-introduce-destroy_suspended_device.patch pm-do-not-destroy-create-devices-while-suspended-in-msrc-rev-2.patch pm-do-not-destroy-create-devices-while-suspended-in-mce_64c.patch pm-do-not-destroy-create-devices-while-suspended-in-cpuidc.patch pm-acquire-device-locks-on-suspend-rev-3.patch pm-acquire-device-locks-on-suspend-rev-3-checkpatch-fixes.patch pm-acquire-device-locks-on-suspend-rev-3-checkpatch-fixes-2.patch git-x86.patch git-xfs.patch cpufreq-initialise-default-governor-before-use.patch page-allocator-clean-up-pcp-draining-functions.patch page-allocator-clean-up-pcp-draining-functions-swsusp-fix.patch page-allocator-clean-up-pcp-draining-functions-swsusp-fix-fix.patch kernel-power-diskc-make-code-static.patch make-kernel_shutdown_prepare-static.patch remove-obsolete-sys-devices-power-state-docs.patch pnp-do-not-stop-start-devices-in-suspend-resume-path.patch proc-fix-the-threaded-proc-self.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