diff options
author | Yang Shi <yang.shi@linaro.org> | 2015-11-18 13:48:55 -0500 |
---|---|---|
committer | Catalin Marinas <catalin.marinas@arm.com> | 2015-11-19 12:57:18 -0500 |
commit | 92e788b749862ebe9920360513a718e5dd4da7a9 (patch) | |
tree | d839587c92f23e6c2087705a9723ab1bddf26359 | |
parent | c139aa60c1007429335131167a0ca181e38c5668 (diff) |
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>
-rw-r--r-- | arch/arm64/kernel/cpuinfo.c | 5 |
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 @@ | |||
30 | #include <linux/seq_file.h> | 30 | #include <linux/seq_file.h> |
31 | #include <linux/sched.h> | 31 | #include <linux/sched.h> |
32 | #include <linux/smp.h> | 32 | #include <linux/smp.h> |
33 | #include <linux/delay.h> | ||
33 | 34 | ||
34 | /* | 35 | /* |
35 | * In case the boot CPU is hotpluggable, we record its initial state and | 36 | * 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) | |||
112 | */ | 113 | */ |
113 | seq_printf(m, "processor\t: %d\n", i); | 114 | seq_printf(m, "processor\t: %d\n", i); |
114 | 115 | ||
116 | seq_printf(m, "BogoMIPS\t: %lu.%02lu\n", | ||
117 | loops_per_jiffy / (500000UL/HZ), | ||
118 | loops_per_jiffy / (5000UL/HZ) % 100); | ||
119 | |||
115 | /* | 120 | /* |
116 | * Dump out the common processor features in a single line. | 121 | * Dump out the common processor features in a single line. |
117 | * Userspace should read the hwcaps with getauxval(AT_HWCAP) | 122 | * Userspace should read the hwcaps with getauxval(AT_HWCAP) |