summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Konovalov <andrey.konovalov@linaro.org>2013-08-11 21:21:58 +0400
committerAndrey Konovalov <andrey.konovalov@linaro.org>2013-08-11 21:21:58 +0400
commitb333e11b885b2959aaec108ba457a1d303bf3080 (patch)
tree057e8157b3e898201376522d0e177b941f009454
parent462bd83b6030a7f78a01161a7c83a7eb8ccf84e1 (diff)
parentb6df0d593a7ff4a4acee828047a3b97dc435664e (diff)
downloadlinux-linaro-tracking-ll_20130811.0.tar.gz
Merge branch 'tracking-ll-misc-fixes' into merge-linux-linaroll-20130811.0ll_20130811.0
-rw-r--r--arch/arm/kernel/topology.c27
1 files changed, 0 insertions, 27 deletions
diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c
index 7da1565d77cd..677da58d9e88 100644
--- a/arch/arm/kernel/topology.c
+++ b/arch/arm/kernel/topology.c
@@ -425,33 +425,6 @@ int cluster_to_logical_mask(unsigned int socket_id, cpumask_t *cluster_mask)
}
/*
- * 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
*/