A global boot_cpu_data is not really required. Lets drop this. While here, rename the local variable as boot_cpu_info when it is fetched for the boot cpu.
Cc: Catalin Marinas <[email protected]> Cc: Will Deacon <[email protected]> Cc: Mark Brown <[email protected]> Cc: Mark Rutland <[email protected]> Cc: Suzuki Poulose <[email protected]> Cc: [email protected] Cc: [email protected] Signed-off-by: Anshuman Khandual <[email protected]> --- Based on 5.7-rc4 arch/arm64/kernel/cpuinfo.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c index a515d8f3639e..dabcdc132e56 100644 --- a/arch/arm64/kernel/cpuinfo.c +++ b/arch/arm64/kernel/cpuinfo.c @@ -31,7 +31,6 @@ * values depending on configuration at or after reset. */ DEFINE_PER_CPU(struct cpuinfo_arm64, cpu_data); -static struct cpuinfo_arm64 boot_cpu_data; static const char *icache_policy_str[] = { [0 ... ICACHE_POLICY_PIPT] = "RESERVED/UNKNOWN", @@ -393,15 +392,16 @@ static void __cpuinfo_store_cpu(struct cpuinfo_arm64 *info) void cpuinfo_store_cpu(void) { struct cpuinfo_arm64 *info = this_cpu_ptr(&cpu_data); + struct cpuinfo_arm64 *boot_cpu_info = &per_cpu(cpu_data, 0); + __cpuinfo_store_cpu(info); - update_cpu_features(smp_processor_id(), info, &boot_cpu_data); + update_cpu_features(smp_processor_id(), info, boot_cpu_info); } void __init cpuinfo_store_boot_cpu(void) { - struct cpuinfo_arm64 *info = &per_cpu(cpu_data, 0); - __cpuinfo_store_cpu(info); + struct cpuinfo_arm64 *boot_cpu_info = &per_cpu(cpu_data, 0); - boot_cpu_data = *info; - init_cpu_features(&boot_cpu_data); + __cpuinfo_store_cpu(boot_cpu_info); + init_cpu_features(boot_cpu_info); } -- 2.20.1
