Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 304992
b: refs/heads/master
c: 0acbb44
h: refs/heads/master
v: v3
  • Loading branch information
Peter Zijlstra authored and Ingo Molnar committed May 9, 2012
1 parent 7b4c2e0 commit 4458cd0
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 94c0dd3278dd3eae52eabf0fb77d472d0dd3e373
refs/heads/master: 0acbb440f06302058e1515861dd534594521e892
11 changes: 11 additions & 0 deletions trunk/arch/x86/kernel/smpboot.c
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,11 @@ void __cpuinit set_cpu_sibling_map(int cpu)
for_each_cpu(i, cpu_sibling_setup_mask) {
struct cpuinfo_x86 *o = &cpu_data(i);

#ifdef CONFIG_NUMA_EMU
if (cpu_to_node(cpu) != cpu_to_node(i))
continue;
#endif

if (cpu_has(c, X86_FEATURE_TOPOEXT)) {
if (c->phys_proc_id == o->phys_proc_id &&
per_cpu(cpu_llc_id, cpu) == per_cpu(cpu_llc_id, i) &&
Expand All @@ -360,11 +365,17 @@ void __cpuinit set_cpu_sibling_map(int cpu)
}

for_each_cpu(i, cpu_sibling_setup_mask) {
#ifdef CONFIG_NUMA_EMU
if (cpu_to_node(cpu) != cpu_to_node(i))
continue;
#endif

if (per_cpu(cpu_llc_id, cpu) != BAD_APICID &&
per_cpu(cpu_llc_id, cpu) == per_cpu(cpu_llc_id, i)) {
cpumask_set_cpu(i, cpu_llc_shared_mask(cpu));
cpumask_set_cpu(cpu, cpu_llc_shared_mask(i));
}

if (c->phys_proc_id == cpu_data(i).phys_proc_id) {
cpumask_set_cpu(i, cpu_core_mask(cpu));
cpumask_set_cpu(cpu, cpu_core_mask(i));
Expand Down

0 comments on commit 4458cd0

Please sign in to comment.