summaryrefslogtreecommitdiff
path: root/arch/arm/include/asm/topology.h
diff options
context:
space:
mode:
authorPaul Walmsley <paul.walmsley@sifive.com>2019-08-30 10:39:38 -0700
committerPaul Walmsley <paul.walmsley@sifive.com>2019-08-30 10:39:38 -0700
commit015b269337e66120179f2da428a5195ec7a4675f (patch)
tree66277b0dedbdef8fa76f80d334c9b55b045c4514 /arch/arm/include/asm/topology.h
parenta256f2e329df0773022d28df2c3d206b9aaf1e61 (diff)
parentf51edcec5288556069d27ab7040a4ce8ca55b74e (diff)
Merge tag 'common/for-v5.4-rc1/cpu-topology' into for-v5.4-rc1-branch
Diffstat (limited to 'arch/arm/include/asm/topology.h')
-rw-r--r--arch/arm/include/asm/topology.h20
1 files changed, 0 insertions, 20 deletions
diff --git a/arch/arm/include/asm/topology.h b/arch/arm/include/asm/topology.h
index 2a786f54d8b8..8a0fae94d45e 100644
--- a/arch/arm/include/asm/topology.h
+++ b/arch/arm/include/asm/topology.h
@@ -5,26 +5,6 @@
#ifdef CONFIG_ARM_CPU_TOPOLOGY
#include <linux/cpumask.h>
-
-struct cputopo_arm {
- int thread_id;
- int core_id;
- int socket_id;
- cpumask_t thread_sibling;
- cpumask_t core_sibling;
-};
-
-extern struct cputopo_arm cpu_topology[NR_CPUS];
-
-#define topology_physical_package_id(cpu) (cpu_topology[cpu].socket_id)
-#define topology_core_id(cpu) (cpu_topology[cpu].core_id)
-#define topology_core_cpumask(cpu) (&cpu_topology[cpu].core_sibling)
-#define topology_sibling_cpumask(cpu) (&cpu_topology[cpu].thread_sibling)
-
-void init_cpu_topology(void);
-void store_cpu_topology(unsigned int cpuid);
-const struct cpumask *cpu_coregroup_mask(int cpu);
-
#include <linux/arch_topology.h>
/* Replace task scheduler's default frequency-invariant accounting */