From b6df0d593a7ff4a4acee828047a3b97dc435664e Mon Sep 17 00:00:00 2001 From: Andrey Konovalov Date: Sun, 11 Aug 2013 20:48:11 +0400 Subject: ll: fix big-LITTLE-MP-master merge error Signed-off-by: Andrey Konovalov --- arch/arm/kernel/topology.c | 27 --------------------------- 1 file changed, 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 @@ -397,33 +397,6 @@ void __init arch_get_hmp_domains(struct list_head *hmp_domains_list) #endif /* CONFIG_SCHED_HMP */ -/* - * 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; -} - /* * cluster_to_logical_mask - return cpu logical mask of CPUs in a cluster * @socket_id: cluster HW identifier -- cgit v1.2.3