summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorYang Shi <yang.shi@linaro.org>2015-11-18 19:48:55 +0100
committerCatalin Marinas <catalin.marinas@arm.com>2015-11-19 18:57:18 +0100
commit92e788b749862ebe9920360513a718e5dd4da7a9 (patch)
treed839587c92f23e6c2087705a9723ab1bddf26359 /arch
parentarm64: barriers: fix smp_load_acquire to work with const arguments (diff)
downloadlinux-92e788b749862ebe9920360513a718e5dd4da7a9.tar.xz
linux-92e788b749862ebe9920360513a718e5dd4da7a9.zip
arm64: restore bogomips information in /proc/cpuinfo
As previously reported, some userspace applications depend on bogomips showed by /proc/cpuinfo. Although there is much less legacy impact on aarch64 than arm, it does break libvirt. This patch reverts commit 326b16db9f69 ("arm64: delay: don't bother reporting bogomips in /proc/cpuinfo"), but with some tweak due to context change and without the pr_info(). Fixes: 326b16db9f69 ("arm64: delay: don't bother reporting bogomips in /proc/cpuinfo") Signed-off-by: Yang Shi <yang.shi@linaro.org> Acked-by: Will Deacon <will.deacon@arm.com> Cc: <stable@vger.kernel.org> # 3.12+ Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm64/kernel/cpuinfo.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c
index 706679d0a0b4..212ae6361d8b 100644
--- a/arch/arm64/kernel/cpuinfo.c
+++ b/arch/arm64/kernel/cpuinfo.c
@@ -30,6 +30,7 @@
#include <linux/seq_file.h>
#include <linux/sched.h>
#include <linux/smp.h>
+#include <linux/delay.h>
/*
* In case the boot CPU is hotpluggable, we record its initial state and
@@ -112,6 +113,10 @@ static int c_show(struct seq_file *m, void *v)
*/
seq_printf(m, "processor\t: %d\n", i);
+ seq_printf(m, "BogoMIPS\t: %lu.%02lu\n",
+ loops_per_jiffy / (500000UL/HZ),
+ loops_per_jiffy / (5000UL/HZ) % 100);
+
/*
* Dump out the common processor features in a single line.
* Userspace should read the hwcaps with getauxval(AT_HWCAP)