Commit bb74e8ca authored by Guenter Roeck's avatar Guenter Roeck Committed by Linus Torvalds

hwmon: (coretemp) Fix compile error if CONFIG_SMP is not defined

cpu_sibling_mask() is not defined unless CONFIG_SMP is defined, so it
must not be used directly in the code without ifdef protection.

To solve the problem and avoid ifdefs in the code, define
for_each_sibling() and use it instead.
Signed-off-by: default avatarGuenter Roeck <guenter.roeck@ericsson.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Durgadoss R <durgadoss.r@intel.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 30cb6d5f
...@@ -51,10 +51,12 @@ ...@@ -51,10 +51,12 @@
#define TO_PHYS_ID(cpu) cpu_data(cpu).phys_proc_id #define TO_PHYS_ID(cpu) cpu_data(cpu).phys_proc_id
#define TO_CORE_ID(cpu) cpu_data(cpu).cpu_core_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 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 #else
#define TO_PHYS_ID(cpu) (cpu) #define TO_PHYS_ID(cpu) (cpu)
#define TO_CORE_ID(cpu) (cpu) #define TO_CORE_ID(cpu) (cpu)
#define TO_ATTR_NO(cpu) (cpu) #define TO_ATTR_NO(cpu) (cpu)
#define for_each_sibling(i, cpu) for (i = 0; false; )
#endif #endif
/* /*
...@@ -762,7 +764,7 @@ static void __cpuinit put_core_offline(unsigned int cpu) ...@@ -762,7 +764,7 @@ static void __cpuinit put_core_offline(unsigned int cpu)
coretemp_remove_core(pdata, &pdev->dev, indx); coretemp_remove_core(pdata, &pdev->dev, indx);
/* Online the HT version of this core, if any */ /* 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) { if (i != cpu) {
get_core_online(i); get_core_online(i);
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment