Commit 561d9a96 authored Dec 03, 2007 by Rafael J. Wysocki Committed by Len Brown Dec 04, 2007

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>

parent 09b56adc

drivers/hwmon/coretemp.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -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;
		}

Admin message