Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 248641
b: refs/heads/master
c: bb74e8c
h: refs/heads/master
i:
  248639: 97c2811
v: v3
  • Loading branch information
Guenter Roeck authored and Linus Torvalds committed May 23, 2011
1 parent 3e9d5fd commit 735dcd1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 30cb6d5f2eb24d15d20139d5ceefaccc68734bd7
refs/heads/master: bb74e8ca352eecefdc5c1a9ebab01f18aa2f6f3c
4 changes: 3 additions & 1 deletion trunk/drivers/hwmon/coretemp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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

/*
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 735dcd1

Please sign in to comment.