The patch titled
HWMON: coretemp, suspend fix
has been added to the -mm tree. Its filename is
hwmon-coretemp-suspend-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
From: Mark M. Hoffman <mhoffman@xxxxxxxxxxxxx>
coretemp, suspend fix
It's not permitted to unregister device/cpu if frozen and going to sleep.
It causes deadlock on systems, where coretemp hwmon is loaded. Do it only
in non-freezed states instead.
Cc: Rafael J. Wysocki <rjw@xxxxxxx> (frozen fix)
Cc: Mark M. Hoffman <mhoffman@xxxxxxxxxxxxx>
Signed-off-by: Jiri Slaby <jirislaby@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/hwmon/coretemp.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff -puN drivers/hwmon/coretemp.c~hwmon-coretemp-suspend-fix drivers/hwmon/coretemp.c
--- a/drivers/hwmon/coretemp.c~hwmon-coretemp-suspend-fix
+++ a/drivers/hwmon/coretemp.c
@@ -338,11 +338,13 @@ 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_DEAD:
- case CPU_DEAD_FROZEN:
+ 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 mhoffman@xxxxxxxxxxxxx are
small-acpica-extension-to-be-able-to-store-the-name-of.patch
export-acpi_check_resource_conflict.patch
mm-only-enforce-acpi-resource-conflict-checks.patch
check-for-acpi-resource-conflicts-in-i2c-bus-drivers.patch
git-hwmon.patch
check-for-acpi-resource-conflicts-in-hwmon-drivers.patch
applesmc-sensors-set-for-macbook2.patch
hwmon-coretemp-suspend-fix.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
