diff options
| author |   Florian Fainelli <f.fainelli@gmail.com> | 2019-06-03 16:18:29 -0700 |
|---|---|---|
| committer |   Will Deacon <will.deacon@arm.com> | 2019-06-05 13:09:11 +0100 |
| commit | 262afe92fa8c7d64118948d98667c102c7d16174 (patch) | |
| tree | fcf84472db9a0a4ef35b1dcde573ba03e9acf486 /arch | |
| parent | arm64: cpufeature: Fix missing ZFR0 in __read_sysreg_by_encoding() (diff) | |
| download | linux-dev-262afe92fa8c7d64118948d98667c102c7d16174.tar.xz linux-dev-262afe92fa8c7d64118948d98667c102c7d16174.zip | |
arm64: smp: Moved cpu_logical_map[] to smp.h
asm/smp.h is included by linux/smp.h and some drivers, in particular
irqchip drivers can access cpu_logical_map[] in order to perform SMP
affinity tasks. Make arm64 consistent with other architectures here.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/include/asm/smp.h | 6 | ||||
| -rw-r--r-- | arch/arm64/include/asm/smp_plat.h | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm64/include/asm/smp.h b/arch/arm64/include/asm/smp.h index 18553f399e08..eae2d6c01262 100644 --- a/arch/arm64/include/asm/smp.h +++ b/arch/arm64/include/asm/smp.h @@ -53,6 +53,12 @@ DECLARE_PER_CPU_READ_MOSTLY(int, cpu_number); */ #define raw_smp_processor_id() (*raw_cpu_ptr(&cpu_number)) +/* + * Logical CPU mapping. + */ +extern u64 __cpu_logical_map[NR_CPUS]; +#define cpu_logical_map(cpu) __cpu_logical_map[cpu] + struct seq_file; /* diff --git a/arch/arm64/include/asm/smp_plat.h b/arch/arm64/include/asm/smp_plat.h index af58dcdefb21..7a495403a18a 100644 --- a/arch/arm64/include/asm/smp_plat.h +++ b/arch/arm64/include/asm/smp_plat.h @@ -37,11 +37,6 @@ static inline u32 mpidr_hash_size(void) } /* - * Logical CPU mapping. - */ -extern u64 __cpu_logical_map[NR_CPUS]; -#define cpu_logical_map(cpu) __cpu_logical_map[cpu] -/* * Retrieve logical cpu index corresponding to a given MPIDR.Aff* * - mpidr: MPIDR.Aff* bits to be used for the look-up * |