sched/x86: Use cpu_llc_shared_mask(cpu) for coregroup_mask
Commit-ID: 9f646389aa7727a2fd8f9ae6337b92af9cfbc264 Gitweb: http://git.kernel.org/tip/9f646389aa7727a2fd8f9ae6337b92af9cfbc264 Author: Peter Zijlstra <[email protected]> AuthorDate: Tue, 29 May 2012 16:39:09 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 30 May 2012 11:05:44 +0200
sched/x86: Use cpu_llc_shared_mask(cpu) for coregroup_mask
Commit commit 8e7fbcbc2 ("sched: Remove stale power aware scheduling remnants and dysfunctional knobs") made a boo-boo with removing the power aware scheduling muck from the x86 topology bits.
We should unconditionally use the llc_shared mask for multi-core.
Reported-and-tested-by Mike Galbraith <[email protected]>
Signed-off-by Peter Zijlstra <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc Andreas Herrmann <[email protected]>
Signed-off-by Ingo Molnar <[email protected]>
--- arch/x86/kernel/smpboot.c | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-)
arch/x86/kernel/smpboot.c +1 -9
@@ -410,15 +410,7 @@ void __cpuinit set_cpu_sibling_map(int cpu)/* maps the cpu to the sched domain representing multi-core */ const struct cpumask *cpu_coregroup_mask (int cpu) { -struct cpuinfo_x86 *c = &cpu_data (cpu); -/* -* For perf, we return last level cache shared map. -* And for power savings, we return cpu_core_map -*/ -if (!(cpu_has (c,X86_FEATURE_AMD_DCM ))) -return cpu_core_mask (cpu); -else -return cpu_llc_shared_mask (cpu); +return cpu_llc_shared_mask (cpu); }static void impress_friends (void )