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

[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 983fa7c153a27bec6fec1998457816eef3c1412e..98e0aa36aebb6b540e83cb16ac455a860b532abc 100644 (file)
--- a/arch/arm64/include/asm/topology.h
+++ b/arch/arm64/include/asm/topology.h
@@ -1,26 +1,26 @@
-#ifndef _ASM_ARM_TOPOLOGY_H
-#define _ASM_ARM_TOPOLOGY_H
+#ifndef __ASM_TOPOLOGY_H
+#define __ASM_TOPOLOGY_H
 
-#ifdef CONFIG_ARM_CPU_TOPOLOGY
+#ifdef CONFIG_SMP
 
 #include <linux/cpumask.h>
 
-struct cputopo_arm {
+struct cpu_topology {
        int thread_id;
        int core_id;
-       int socket_id;
+       int cluster_id;
        cpumask_t thread_sibling;
        cpumask_t core_sibling;
 };
 
-extern struct cputopo_arm cpu_topology[NR_CPUS];
+extern struct cpu_topology cpu_topology[NR_CPUS];
 
-#define topology_physical_package_id(cpu)      (cpu_topology[cpu].socket_id)
+#define topology_physical_package_id(cpu)      (cpu_topology[cpu].cluster_id)
 #define topology_core_id(cpu)          (cpu_topology[cpu].core_id)
 #define topology_core_cpumask(cpu)     (&cpu_topology[cpu].core_sibling)
 #define topology_thread_cpumask(cpu)   (&cpu_topology[cpu].thread_sibling)
 
-#define mc_capable()   (cpu_topology[0].socket_id != -1)
+#define mc_capable()   (cpu_topology[0].cluster_id != -1)
 #define smt_capable()  (cpu_topology[0].thread_id != -1)
 
 void init_cpu_topology(void);