Skip to content

Commit

Permalink
x86: move cpu_coregroup_map to common file
Browse files Browse the repository at this point in the history
it is equal between architectures

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Glauber Costa authored and Ingo Molnar committed Apr 17, 2008
1 parent 768d950 commit 70708a1
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 28 deletions.
16 changes: 16 additions & 0 deletions arch/x86/kernel/smpboot.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#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;
Expand Down Expand Up @@ -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)
{
Expand Down
14 changes: 0 additions & 14 deletions arch/x86/kernel/smpboot_32.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down
14 changes: 0 additions & 14 deletions arch/x86/kernel/smpboot_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
*/
Expand Down

0 comments on commit 70708a1

Please sign in to comment.