From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 27 Jan 2016 18:01:41 +0000 (-0800)
Subject: 4.1-stable patches
X-Git-Tag: v3.10.96~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f623bda8b359e63d033a818ea1467b52146fe2b6;p=thirdparty%2Fkernel%2Fstable-queue.git

4.1-stable patches

added patches:
	arm64-restore-bogomips-information-in-proc-cpuinfo.patch
---

diff --git a/queue-4.1/arm64-restore-bogomips-information-in-proc-cpuinfo.patch b/queue-4.1/arm64-restore-bogomips-information-in-proc-cpuinfo.patch
new file mode 100644
index 00000000000..b955dff1b2a
--- /dev/null
+++ b/queue-4.1/arm64-restore-bogomips-information-in-proc-cpuinfo.patch
@@ -0,0 +1,41 @@
+From 92e788b749862ebe9920360513a718e5dd4da7a9 Mon Sep 17 00:00:00 2001
+From: Yang Shi <yang.shi@linaro.org>
+Date: Wed, 18 Nov 2015 10:48:55 -0800
+Subject: arm64: restore bogomips information in /proc/cpuinfo
+
+From: Yang Shi <yang.shi@linaro.org>
+
+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 <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>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm64/kernel/setup.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/arch/arm64/kernel/setup.c
++++ b/arch/arm64/kernel/setup.c
+@@ -523,6 +523,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-4.1/series b/queue-4.1/series
index fdfee36dde6..6a4c97a65f6 100644
--- a/queue-4.1/series
+++ b/queue-4.1/series
@@ -124,3 +124,4 @@ media-vivid-osd-fix-info-leak-in-ioctl.patch
 direct-io-fix-negative-return-from-dio-read-beyond-eof.patch
 fix-the-regression-from-direct-io-fix-negative-return-from-dio-read-beyond-eof.patch
 mn10300-select-config_have_uid16-to-fix-build-failure.patch
+arm64-restore-bogomips-information-in-proc-cpuinfo.patch