diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2007-12-03 18:01:50 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-12-04 07:35:32 +0100 |
| commit | 561d9a969455cb009bb15b63e1d925dc527e7a9d (patch) | |
| tree | c5465a27338ef4ca6cf0b554e86d0f2a880815d7 /drivers | |
| parent | Linux 2.6.24-rc4 (diff) | |
| download | linux-561d9a969455cb009bb15b63e1d925dc527e7a9d.tar.xz linux-561d9a969455cb009bb15b63e1d925dc527e7a9d.zip | |
HWMON: coretemp, suspend fix
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 too 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@sisk.pl>
Acked-by: Mark M. Hoffman <mhoffman@lightlink.com>
Cc: Jiri Slaby <jirislaby@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/hwmon/coretemp.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c index 5c82ec7f8bbd..3ee60d26e3a2 100644 --- a/drivers/hwmon/coretemp.c +++ b/drivers/hwmon/coretemp.c @@ -337,11 +337,10 @@ 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); break; - case CPU_DEAD: - case CPU_DEAD_FROZEN: + case CPU_DOWN_PREPARE: coretemp_device_remove(cpu); break; } |