diff options
author | Will Deacon <will.deacon@arm.com> | 2013-08-30 13:06:48 -0400 |
---|---|---|
committer | Catalin Marinas <catalin.marinas@arm.com> | 2013-08-30 13:47:07 -0400 |
commit | 326b16db9f69fd0d279be873c6c00f88c0a4aad5 (patch) | |
tree | 9c4994234516a57e26e2697f78aa78c4c4d0a4bd | |
parent | e25208f77c2dad5a9f2ab3d3df61252a90b71afa (diff) |
arm64: delay: don't bother reporting bogomips in /proc/cpuinfo
We always use a timer-backed delay loop for arm64, so don't bother
reporting a bogomips value which appears to confuse some people.
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
-rw-r--r-- | arch/arm64/kernel/setup.c | 3 | ||||
-rw-r--r-- | arch/arm64/kernel/smp.c | 6 |
2 files changed, 1 insertions, 8 deletions
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index add6ea616843..bca4c1c2052a 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c | |||
@@ -328,9 +328,6 @@ static int c_show(struct seq_file *m, void *v) | |||
328 | #ifdef CONFIG_SMP | 328 | #ifdef CONFIG_SMP |
329 | seq_printf(m, "processor\t: %d\n", i); | 329 | seq_printf(m, "processor\t: %d\n", i); |
330 | #endif | 330 | #endif |
331 | seq_printf(m, "BogoMIPS\t: %lu.%02lu\n\n", | ||
332 | loops_per_jiffy / (500000UL/HZ), | ||
333 | loops_per_jiffy / (5000UL/HZ) % 100); | ||
334 | } | 331 | } |
335 | 332 | ||
336 | /* dump out the processor features */ | 333 | /* dump out the processor features */ |
diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c index fee5cce83450..78db90dcc910 100644 --- a/arch/arm64/kernel/smp.c +++ b/arch/arm64/kernel/smp.c | |||
@@ -223,11 +223,7 @@ asmlinkage void secondary_start_kernel(void) | |||
223 | 223 | ||
224 | void __init smp_cpus_done(unsigned int max_cpus) | 224 | void __init smp_cpus_done(unsigned int max_cpus) |
225 | { | 225 | { |
226 | unsigned long bogosum = loops_per_jiffy * num_online_cpus(); | 226 | pr_info("SMP: Total of %d processors activated.\n", num_online_cpus()); |
227 | |||
228 | pr_info("SMP: Total of %d processors activated (%lu.%02lu BogoMIPS).\n", | ||
229 | num_online_cpus(), bogosum / (500000/HZ), | ||
230 | (bogosum / (5000/HZ)) % 100); | ||
231 | } | 227 | } |
232 | 228 | ||
233 | void __init smp_prepare_boot_cpu(void) | 229 | void __init smp_prepare_boot_cpu(void) |