From b7e6b40fb5624a27a1371c619facea3f56da8ee7 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Wed, 9 May 2012 13:31:47 +0200 Subject: [PATCH] --- yaml --- r: 304993 b: refs/heads/master c: ad7687dde8780a0d618a3e3b5a62bb383696fc22 h: refs/heads/master i: 304991: 7b4c2e0d5641b967a2a27037c8fa5d8191043044 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/smpboot.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 9d0e9eec7005..6d80d9184a9c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0acbb440f06302058e1515861dd534594521e892 +refs/heads/master: ad7687dde8780a0d618a3e3b5a62bb383696fc22 diff --git a/trunk/arch/x86/kernel/smpboot.c b/trunk/arch/x86/kernel/smpboot.c index edfd03a9e390..7c53d96d44ab 100644 --- a/trunk/arch/x86/kernel/smpboot.c +++ b/trunk/arch/x86/kernel/smpboot.c @@ -337,10 +337,10 @@ 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)) + if (cpu_to_node(cpu) != cpu_to_node(i)) { + WARN_ONCE(1, "sched: CPU #%d's thread-sibling CPU #%d not on the same node! [node %d != %d]. Ignoring sibling dependency.\n", cpu, i, 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 && @@ -365,10 +365,10 @@ 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)) + if (cpu_to_node(cpu) != cpu_to_node(i)) { + WARN_ONCE(1, "sched: CPU #%d's core-sibling CPU #%d not on the same node! [node %d != %d]. Ignoring sibling dependency.\n", cpu, i, 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)) {