Commit 70708a18 authored by Glauber Costa's avatar Glauber Costa Committed by Ingo Molnar
Browse files

x86: move cpu_coregroup_map to common file 



it is equal between architectures

Signed-off-by: default avatarGlauber Costa <gcosta@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 768d9505

arch/x86/kernel/smpboot.c

+16 −0
Original line number Diff line number Diff line 
#include <linux/init.h>

#include <linux/smp.h>

#include <linux/module.h>

#include <linux/sched.h>



/* Number of siblings per CPU package */

int smp_num_siblings = 1;
@@ -95,6 +96,21 @@ void __cpuinit set_cpu_sibling_map(int cpu) 
	}

}



/* maps the cpu to the sched domain representing multi-core */

cpumask_t cpu_coregroup_map(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 (sched_mc_power_savings || sched_smt_power_savings)

		return per_cpu(cpu_core_map, cpu);

	else

		return c->llc_shared_map;

}





#ifdef CONFIG_HOTPLUG_CPU

void remove_siblinginfo(int cpu)

{

arch/x86/kernel/smpboot_32.c

+0 −14
Original line number Diff line number Diff line
@@ -260,20 +260,6 @@ static void __cpuinit smp_callin(void) 


static int cpucount;



/* maps the cpu to the sched domain representing multi-core */

cpumask_t cpu_coregroup_map(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 (sched_mc_power_savings || sched_smt_power_savings)

		return per_cpu(cpu_core_map, cpu);

	else

		return c->llc_shared_map;

}



/*

 * Activate a secondary processor.

 */

arch/x86/kernel/smpboot_64.c

+0 −14
Original line number Diff line number Diff line
@@ -211,20 +211,6 @@ void __cpuinit smp_callin(void) 
	cpu_set(cpuid, cpu_callin_map);

}



/* maps the cpu to the sched domain representing multi-core */

cpumask_t cpu_coregroup_map(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 (sched_mc_power_savings || sched_smt_power_savings)

		return per_cpu(cpu_core_map, cpu);

	else

		return c->llc_shared_map;

}



/*

 * Setup code on secondary processor (after comming out of the trampoline)

 */