Merge remote-tracking branch 'lsk/v3.10/topic/arm64-hmp' into linux-linaro-lsk

[firefly-linux-kernel-4.4.55.git] / arch / arm64 / include / asm / topology.h

diff --git a/arch/arm64/include/asm/topology.h b/arch/arm64/include/asm/topology.h
index 98e0aa36aebb6b540e83cb16ac455a860b532abc..e0171b393a14c38395f8fc92875f6cd00e17fc0a 100644 (file)
--- a/arch/arm64/include/asm/topology.h
+++ b/arch/arm64/include/asm/topology.h
@@ -26,7 +26,6 @@ extern struct cpu_topology 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);
 
 #ifdef CONFIG_DISABLE_CPU_SCHED_DOMAIN_BALANCE
 /* Common values for CPUs */
@@ -63,8 +62,6 @@ int cluster_to_logical_mask(unsigned int socket_id, cpumask_t *cluster_mask);
 
 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