diff options
| author | Jeremy Linton | 2018-05-12 01:58:04 +0200 |
|---|---|---|
| committer | Catalin Marinas | 2018-05-17 18:28:09 +0200 |
| commit | 868abc07680c2c8b7f85ae883f9f1b90bf4ef4bf (patch) | |
| tree | 3c8dc1a639360f5f3e6858a09e88ca275d6ea7d8 /arch/arm64/include/asm/topology.h | |
| parent | arm64: Add support for ACPI based firmware tables (diff) | |
| download | kernel-qcow2-linux-868abc07680c2c8b7f85ae883f9f1b90bf4ef4bf.tar.gz kernel-qcow2-linux-868abc07680c2c8b7f85ae883f9f1b90bf4ef4bf.tar.xz kernel-qcow2-linux-868abc07680c2c8b7f85ae883f9f1b90bf4ef4bf.zip | |
arm64: topology: rename cluster_id
The cluster concept isn't architecturally defined for arm64.
Lets match the name of the arm64 topology field to the kernel macro
that uses it.
Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Tested-by: Vijaya Kumar K <vkilari@codeaurora.org>
Tested-by: Xiongfeng Wang <wangxiongfeng2@huawei.com>
Tested-by: Tomasz Nowicki <Tomasz.Nowicki@cavium.com>
Acked-by: Sudeep Holla <sudeep.holla@arm.com>
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Acked-by: Morten Rasmussen <morten.rasmussen@arm.com>
Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm64/include/asm/topology.h')
| -rw-r--r-- | arch/arm64/include/asm/topology.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/include/asm/topology.h b/arch/arm64/include/asm/topology.h index c4f2d50491eb..6b10459e6905 100644 --- a/arch/arm64/include/asm/topology.h +++ b/arch/arm64/include/asm/topology.h @@ -7,14 +7,14 @@ struct cpu_topology { int thread_id; int core_id; - int cluster_id; + int package_id; cpumask_t thread_sibling; cpumask_t core_sibling; }; extern struct cpu_topology cpu_topology[NR_CPUS]; -#define topology_physical_package_id(cpu) (cpu_topology[cpu].cluster_id) +#define topology_physical_package_id(cpu) (cpu_topology[cpu].package_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) |