Commit e40cc4bd authored Sep 13, 2010 by Jan Beulich Committed by Guenter Roeck Sep 24, 2010

x86/hwmon: register alternate sibling upon CPU removal



Just like pkgtemp registers another core of the same package when one
gets removed, coretemp should register another hyperthread (if
available) in that situation.

As pointed out in the patch fixing the respective code in pkgtemp, the
list protectng mutex must be dropped before calling
coretemp_device_add(), and due to the restructured loop (including an
explicit return) the "safe" variant of the list iterator isn't needed
anymore.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Cc: Rudolf Marek <r.marek@assembler.cz>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>

parent f6aeccdb

drivers/hwmon/coretemp.c

+15 −7

Original line number	Diff line number	Diff line
		@@ -491,14 +491,22 @@ exit:

		static void coretemp_device_remove(unsigned int cpu)
		{
		struct pdev_entry p, n;
		struct pdev_entry *p;
		unsigned int i;

		mutex_lock(&pdev_list_mutex);
		list_for_each_entry_safe(p, n, &pdev_list, list) {
		if (p->cpu == cpu) {
		list_for_each_entry(p, &pdev_list, list) {
		if (p->cpu != cpu)
		continue;

		platform_device_unregister(p->pdev);
		list_del(&p->list);
		mutex_unlock(&pdev_list_mutex);
		kfree(p);
		}
		for_each_cpu(i, cpu_sibling_mask(cpu))
		if (i != cpu && !coretemp_device_add(i))
		break;
		return;
		}
		mutex_unlock(&pdev_list_mutex);
		}

Admin message