The patch titled
HWMON: coretemp, suspend fix (fix)
has been added to the -mm tree. Its filename is
hwmon-coretemp-suspend-fix-fix.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: HWMON: coretemp, suspend fix (fix)
From: "Rafael J. Wysocki" <rjw@xxxxxxx>
It's not permitted to unregister a device after devices have been suspended.
It causes deadlocks to appear on systems with coretemp hwmon loaded. To avoid
this, we can make coretemp_cpu_callback() do nothing if the _FROZEN bit is set
in action.
Also, in other cases it's generally to late to unregister the coretemp device
if the CPU is already dead, so it should be unregistered on CPU_DOWN_PREPARE.
Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx> (frozen fix)
Cc: Mark M. Hoffman <mhoffman@xxxxxxxxxxxxx>
Cc: Jiri Slaby <jirislaby@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/hwmon/coretemp.c | 3 ---
1 file changed, 3 deletions(-)
diff -puN drivers/hwmon/coretemp.c~hwmon-coretemp-suspend-fix-fix drivers/hwmon/coretemp.c
--- a/drivers/hwmon/coretemp.c~hwmon-coretemp-suspend-fix-fix
+++ a/drivers/hwmon/coretemp.c
@@ -337,14 +337,11 @@ static int coretemp_cpu_callback(struct
switch (action) {
case CPU_ONLINE:
- case CPU_ONLINE_FROZEN:
case CPU_DOWN_FAILED:
coretemp_device_add(cpu);
- case CPU_DOWN_FAILED_FROZEN:
break;
case CPU_DOWN_PREPARE:
coretemp_device_remove(cpu);
- case CPU_DOWN_PREPARE_FROZEN:
break;
}
return NOTIFY_OK;
_
Patches currently in -mm which might be from rjw@xxxxxxx are
isdn-bootup-crash-fix-2624-rc3-git1.patch
git-acpi.patch
gregkh-driver-kset-convert-to-kobj_sysfs_ops-vs-git-acpi.patch
fix-proc-net-breakage.patch
hwmon-coretemp-suspend-fix.patch
hwmon-coretemp-suspend-fix-fix.patch
restore-missing-sysfs-max_cstate-attr.patch
page-allocator-clean-up-pcp-draining-functions.patch
kernel-power-diskc-make-code-static.patch
make-kernel_shutdown_prepare-static.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
