Re: [lm-sensors] [PATCH 1/1] HWMON: coretemp, suspend fix

On 11/30/2007 11:15 PM, Jean Delvare wrote:
Hi Jiri,

Hi.

On Fri, 30 Nov 2007 15:12:46 +0100, Jiri Slaby wrote:
Ok, I don't see it merged in the latest -mm (mmotm). Could you, Mark, Rafael,
sign off this version of the patch (Mark's + Rafael's 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>

---
commit 4f0e19b172ed18fb29e8006c4470fd37aa245a7a
tree bec1cc4f7a499efe94c5f9d2d208db325914f28e
parent 877dcc2ef6c7c17a64155cf201886c49622250e9
author Jiri Slaby <jirislaby@xxxxxxxxx> Tue, 27 Nov 2007 20:19:47 +0100
committer Jiri Slaby <ku@xxxxxxxxxxxxxxxxxxx> Thu, 29 Nov 2007 23:41:11 +0100

drivers/hwmon/coretemp.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
index 5c82ec7..ce7457d 100644
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
@@ -338,11 +338,13 @@ static int coretemp_cpu_callback(struct notifier_block *nfb,
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;

Should this change go to the stable tree(s) as well?

Sorry, I have no idea. Rafael?
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Relevant Pages