aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-12-16 12:25:27 +0000
committerMark Brown <broonie@linaro.org>2013-12-16 12:30:53 +0000
commit57fe174881fcfdf4749925aeb3d288a8bb79efc8 (patch)
treebc42c01885307d3ab2c28e4d5b427a97862759d2
parentd474d10a1a827e0b3402943a62a97d95c0eabf8d (diff)
downloadlinaro-lsk-57fe174881fcfdf4749925aeb3d288a8bb79efc8.tar.gz
arm64: topology: Remove cluster_to_logical_mask()
It's not used in the current code. Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--arch/arm64/include/asm/topology.h3
-rw-r--r--arch/arm64/kernel/topology.c29
2 files changed, 0 insertions, 32 deletions
diff --git a/arch/arm64/include/asm/topology.h b/arch/arm64/include/asm/topology.h
index 611edefaeaf..58b8b84adcd 100644
--- a/arch/arm64/include/asm/topology.h
+++ b/arch/arm64/include/asm/topology.h
@@ -26,14 +26,11 @@ extern struct cputopo_arm cpu_topology[NR_CPUS];
void init_cpu_topology(void);
void store_cpu_topology(unsigned int cpuid);
const struct cpumask *cpu_coregroup_mask(int cpu);
-int cluster_to_logical_mask(unsigned int socket_id, cpumask_t *cluster_mask);
#else
static inline void init_cpu_topology(void) { }
static inline void store_cpu_topology(unsigned int cpuid) { }
-static inline int cluster_to_logical_mask(unsigned int socket_id,
- cpumask_t *cluster_mask) { return -EINVAL; }
#endif
diff --git a/arch/arm64/kernel/topology.c b/arch/arm64/kernel/topology.c
index 83d6919d4e0..8828e0bfc32 100644
--- a/arch/arm64/kernel/topology.c
+++ b/arch/arm64/kernel/topology.c
@@ -363,35 +363,6 @@ void store_cpu_topology(unsigned int cpuid)
update_cpu_power(cpuid);
}
-
-/*
- * cluster_to_logical_mask - return cpu logical mask of CPUs in a cluster
- * @socket_id: cluster HW identifier
- * @cluster_mask: the cpumask location to be initialized, modified by the
- * function only if return value == 0
- *
- * Return:
- *
- * 0 on success
- * -EINVAL if cluster_mask is NULL or there is no record matching socket_id
- */
-int cluster_to_logical_mask(unsigned int socket_id, cpumask_t *cluster_mask)
-{
- int cpu;
-
- if (!cluster_mask)
- return -EINVAL;
-
- for_each_online_cpu(cpu) {
- if (socket_id == topology_physical_package_id(cpu)) {
- cpumask_copy(cluster_mask, topology_core_cpumask(cpu));
- return 0;
- }
- }
-
- return -EINVAL;
-}
-
/*
* init_cpu_topology is called at boot when only one cpu is running
* which prevent simultaneous write access to cpu_topology array