diff options
| author |   Jan Beulich <jbeulich@novell.com> | 2010-09-13 10:23:05 +0000 |
|---|---|---|
| committer |   Guenter Roeck <guenter.roeck@ericsson.com> | 2010-09-24 11:44:19 -0700 |
| commit | e40cc4bdfd4b89813f072f72bd9c7055814d3f0f (patch) | |
| tree | aab7459b56b53ea2aaec22900aeb687454f5ccfa /drivers/hwmon/coretemp.c | |
| parent | x86/hwmon: fix initialization of pkgtemp (diff) | |
| download | linux-dev-e40cc4bdfd4b89813f072f72bd9c7055814d3f0f.tar.xz linux-dev-e40cc4bdfd4b89813f072f72bd9c7055814d3f0f.zip | |
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>
Diffstat (limited to '')
| -rw-r--r-- | drivers/hwmon/coretemp.c | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c index 5850da64ae28..baa842a80b4b 100644 --- a/drivers/hwmon/coretemp.c +++ b/drivers/hwmon/coretemp.c @@ -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) { - platform_device_unregister(p->pdev); - list_del(&p->list); - kfree(p); - } + 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); } |