From 5b0e97441043b8880dc0b03216a659abdd70a90c Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 27 Jan 2016 10:01:37 -0800 Subject: [PATCH] 3.14-stable patches added patches: arm64-restore-bogomips-information-in-proc-cpuinfo.patch --- ...bogomips-information-in-proc-cpuinfo.patch | 41 +++++++++++++++++++ queue-3.14/series | 1 + 2 files changed, 42 insertions(+) create mode 100644 queue-3.14/arm64-restore-bogomips-information-in-proc-cpuinfo.patch diff --git a/queue-3.14/arm64-restore-bogomips-information-in-proc-cpuinfo.patch b/queue-3.14/arm64-restore-bogomips-information-in-proc-cpuinfo.patch new file mode 100644 index 00000000000..f9dcb03019e --- /dev/null +++ b/queue-3.14/arm64-restore-bogomips-information-in-proc-cpuinfo.patch @@ -0,0 +1,41 @@ +From 92e788b749862ebe9920360513a718e5dd4da7a9 Mon Sep 17 00:00:00 2001 +From: Yang Shi +Date: Wed, 18 Nov 2015 10:48:55 -0800 +Subject: arm64: restore bogomips information in /proc/cpuinfo + +From: Yang Shi + +commit 92e788b749862ebe9920360513a718e5dd4da7a9 upstream. + +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 +Acked-by: Will Deacon +Cc: # 3.12+ +Signed-off-by: Catalin Marinas +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm64/kernel/setup.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/arch/arm64/kernel/setup.c ++++ b/arch/arm64/kernel/setup.c +@@ -446,6 +446,10 @@ static int c_show(struct seq_file *m, vo + seq_printf(m, "processor\t: %d\n", i); + #endif + ++ 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) diff --git a/queue-3.14/series b/queue-3.14/series index 0d66c017415..0caac688135 100644 --- a/queue-3.14/series +++ b/queue-3.14/series @@ -56,3 +56,4 @@ parisc-iommu-fix-panic-due-to-trying-to-allocate-too-large-region.patch hid-core-avoid-uninitialized-buffer-access.patch openrisc-fix-config_uid16-setting.patch mn10300-select-config_have_uid16-to-fix-build-failure.patch +arm64-restore-bogomips-information-in-proc-cpuinfo.patch -- 2.39.5