diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-02-16 09:45:33 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-02-16 09:45:47 +0100 |
| commit | 275a88d3cf0e2f08a98dc5ce9494af0cb6ed2092 (patch) | |
| tree | 785ce29ec09904fbde73c63e3aeadaf6537752a5 /arch/x86/kernel/smpboot.c | |
| parent | 52b8b8d7251f8f7b8ed4a6c623618106d83e18b5 (diff) | |
| parent | 9e81509efc4fefcdd75cc6a4121672fa71ae8745 (diff) | |
Merge branch 'x86/amd-nb' into x86/mm
Merge reason: consolidate it into the more generic x86/mm tree to prevent conflicts
with ongoing NUMA work.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/smpboot.c')
| -rw-r--r-- | arch/x86/kernel/smpboot.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 8886ef36d5d..fe4837136e0 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -353,6 +353,7 @@ void __cpuinit set_cpu_sibling_map(int cpu) 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) && c->compute_unit_id == o->compute_unit_id) link_thread_siblings(cpu, i); } else if (c->phys_proc_id == o->phys_proc_id && |