diff options
author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-08-11 20:48:11 +0400 |
---|---|---|
committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-08-11 20:48:11 +0400 |
commit | b6df0d593a7ff4a4acee828047a3b97dc435664e (patch) | |
tree | 057e8157b3e898201376522d0e177b941f009454 | |
parent | c6f9e37b8d169519ae5935c09e0b3ef9fafcd781 (diff) |
ll: fix big-LITTLE-MP-master merge errortracking-ll-misc-fixes-ll-20130811.0
Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>
-rw-r--r-- | arch/arm/kernel/topology.c | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c index 7da1565d77c..677da58d9e8 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 */ |