From 735dcd1cab38b8527ac73eaed319d0bdebfd5479 Mon Sep 17 00:00:00 2001 From: Guenter Roeck Date: Mon, 23 May 2011 12:06:41 -0700 Subject: [PATCH] --- yaml --- r: 248641 b: refs/heads/master c: bb74e8ca352eecefdc5c1a9ebab01f18aa2f6f3c h: refs/heads/master i: 248639: 97c2811b9e168489e30f2d2f21abe9ff8cf7fb95 v: v3 --- [refs] | 2 +- trunk/drivers/hwmon/coretemp.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e29cf762a115..cdf1e344cbd1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 30cb6d5f2eb24d15d20139d5ceefaccc68734bd7 +refs/heads/master: bb74e8ca352eecefdc5c1a9ebab01f18aa2f6f3c diff --git a/trunk/drivers/hwmon/coretemp.c b/trunk/drivers/hwmon/coretemp.c index 5c7cd60d5f9d..a00245eb3fa0 100644 --- a/trunk/drivers/hwmon/coretemp.c +++ b/trunk/drivers/hwmon/coretemp.c @@ -51,10 +51,12 @@ #define TO_PHYS_ID(cpu) cpu_data(cpu).phys_proc_id #define TO_CORE_ID(cpu) cpu_data(cpu).cpu_core_id #define TO_ATTR_NO(cpu) (TO_CORE_ID(cpu) + BASE_SYSFS_ATTR_NO) +#define for_each_sibling(i, cpu) for_each_cpu(i, cpu_sibling_mask(cpu)) #else #define TO_PHYS_ID(cpu) (cpu) #define TO_CORE_ID(cpu) (cpu) #define TO_ATTR_NO(cpu) (cpu) +#define for_each_sibling(i, cpu) for (i = 0; false; ) #endif /* @@ -762,7 +764,7 @@ static void __cpuinit put_core_offline(unsigned int cpu) coretemp_remove_core(pdata, &pdev->dev, indx); /* Online the HT version of this core, if any */ - for_each_cpu(i, cpu_sibling_mask(cpu)) { + for_each_sibling(i, cpu) { if (i != cpu) { get_core_online(i); break;