aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm64/kernel/setup.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm64/kernel/setup.c')
-rw-r--r--arch/arm64/kernel/setup.c16
1 files changed, 2 insertions, 14 deletions
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index 14808947bf46..3852405d70b5 100644
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -50,7 +50,6 @@
50#include <asm/cpu.h> 50#include <asm/cpu.h>
51#include <asm/cputype.h> 51#include <asm/cputype.h>
52#include <asm/elf.h> 52#include <asm/elf.h>
53#include <asm/cputable.h>
54#include <asm/cpufeature.h> 53#include <asm/cpufeature.h>
55#include <asm/cpu_ops.h> 54#include <asm/cpu_ops.h>
56#include <asm/sections.h> 55#include <asm/sections.h>
@@ -84,7 +83,6 @@ unsigned int compat_elf_hwcap2 __read_mostly;
84 83
85DECLARE_BITMAP(cpu_hwcaps, ARM64_NCAPS); 84DECLARE_BITMAP(cpu_hwcaps, ARM64_NCAPS);
86 85
87static const char *cpu_name;
88phys_addr_t __fdt_pointer __initdata; 86phys_addr_t __fdt_pointer __initdata;
89 87
90/* 88/*
@@ -234,22 +232,12 @@ void __init up_late_init(void)
234 232
235static void __init setup_processor(void) 233static void __init setup_processor(void)
236{ 234{
237 struct cpu_info *cpu_info;
238 u64 features, block; 235 u64 features, block;
239 u32 cwg; 236 u32 cwg;
240 int cls; 237 int cls;
241 238
242 cpu_info = lookup_processor_type(read_cpuid_id()); 239 printk("CPU: AArch64 Processor [%08x] revision %d\n",
243 if (!cpu_info) { 240 read_cpuid_id(), read_cpuid_id() & 15);
244 printk("CPU configuration botched (ID %08x), unable to continue.\n",
245 read_cpuid_id());
246 while (1);
247 }
248
249 cpu_name = cpu_info->cpu_name;
250
251 printk("CPU: %s [%08x] revision %d\n",
252 cpu_name, read_cpuid_id(), read_cpuid_id() & 15);
253 241
254 sprintf(init_utsname()->machine, ELF_PLATFORM); 242 sprintf(init_utsname()->machine, ELF_PLATFORM);
255 elf_hwcap = 0; 243 elf_hwcap = 0;