summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2009-03-26 15:24:58 +0100
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2009-03-26 15:24:32 +0100
commit6f7a321d5feb0bc9aa7f7b14eceb1e6a63bff937 (patch)
treee35ef379c9f6d2d755b9aa2338bd72346912d366
parentc70d0fef1da286d7f96e774674aea2d20cf6222f (diff)
downloadop-kernel-dev-6f7a321d5feb0bc9aa7f7b14eceb1e6a63bff937.zip
op-kernel-dev-6f7a321d5feb0bc9aa7f7b14eceb1e6a63bff937.tar.gz
[S390] cpumask: remove cpu_coregroup_map
Impact: cleanup cpu_coregroup_mask is the New Hotness. As S/390 uses theirs internally, so we just make it static. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
-rw-r--r--arch/s390/include/asm/topology.h1
-rw-r--r--arch/s390/kernel/topology.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/s390/include/asm/topology.h b/arch/s390/include/asm/topology.h
index c979c3b..5e0ad61 100644
--- a/arch/s390/include/asm/topology.h
+++ b/arch/s390/include/asm/topology.h
@@ -5,7 +5,6 @@
#define mc_capable() (1)
-cpumask_t cpu_coregroup_map(unsigned int cpu);
const struct cpumask *cpu_coregroup_mask(unsigned int cpu);
extern cpumask_t cpu_core_map[NR_CPUS];
diff --git a/arch/s390/kernel/topology.c b/arch/s390/kernel/topology.c
index cc362c9..3c72c9c 100644
--- a/arch/s390/kernel/topology.c
+++ b/arch/s390/kernel/topology.c
@@ -74,7 +74,7 @@ static DEFINE_SPINLOCK(topology_lock);
cpumask_t cpu_core_map[NR_CPUS];
-cpumask_t cpu_coregroup_map(unsigned int cpu)
+static cpumask_t cpu_coregroup_map(unsigned int cpu)
{
struct core_info *core = &core_info;
unsigned long flags;
OpenPOWER on IntegriCloud