aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2008-12-26 06:53:42 -0500
committerRusty Russell <rusty@rustcorp.com.au>2008-12-26 06:53:42 -0500
commit9be3eec2c83848a1ca57ebad13c63c95d0df01e2 (patch)
tree2a832674ba07a3e01c0d56820ee497f125a1556f /arch/s390
parenta0ae09b46a516f05ea76e3419ad43c46f52c1165 (diff)
cpumask: cpu_coregroup_mask(): s390
Like cpu_coregroup_map, but returns a (const) pointer. Compile-tested on s390 (defconfig). Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: Mike Travis <travis@sgi.com>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/include/asm/topology.h1
-rw-r--r--arch/s390/kernel/topology.c5
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/s390/include/asm/topology.h b/arch/s390/include/asm/topology.h
index d96c91643458..fff4a86c602a 100644
--- a/arch/s390/include/asm/topology.h
+++ b/arch/s390/include/asm/topology.h
@@ -6,6 +6,7 @@
6#define mc_capable() (1) 6#define mc_capable() (1)
7 7
8cpumask_t cpu_coregroup_map(unsigned int cpu); 8cpumask_t cpu_coregroup_map(unsigned int cpu);
9const struct cpumask *cpu_coregroup_mask(unsigned int cpu);
9 10
10extern cpumask_t cpu_core_map[NR_CPUS]; 11extern cpumask_t cpu_core_map[NR_CPUS];
11 12
diff --git a/arch/s390/kernel/topology.c b/arch/s390/kernel/topology.c
index a947899dcba1..0601cd3231e4 100644
--- a/arch/s390/kernel/topology.c
+++ b/arch/s390/kernel/topology.c
@@ -93,6 +93,11 @@ cpumask_t cpu_coregroup_map(unsigned int cpu)
93 return mask; 93 return mask;
94} 94}
95 95
96const struct cpumask *cpu_coregroup_mask(unsigned int cpu)
97{
98 return &cpu_core_map[cpu];
99}
100
96static void add_cpus_to_core(struct tl_cpu *tl_cpu, struct core_info *core) 101static void add_cpus_to_core(struct tl_cpu *tl_cpu, struct core_info *core)
97{ 102{
98 unsigned int cpu; 103 unsigned int cpu;