From patchwork Wed Jan 27 12:14:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 60618 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp2545185lbb; Wed, 27 Jan 2016 04:14:35 -0800 (PST) X-Received: by 10.98.93.136 with SMTP id n8mr41529629pfj.88.1453896875508; Wed, 27 Jan 2016 04:14:35 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d9si9191804pas.186.2016.01.27.04.14.35; Wed, 27 Jan 2016 04:14:35 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753013AbcA0MOe (ORCPT + 2 others); Wed, 27 Jan 2016 07:14:34 -0500 Received: from cam-admin0.cambridge.arm.com ([217.140.96.50]:50986 "EHLO cam-admin0.cambridge.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751298AbcA0MOe (ORCPT ); Wed, 27 Jan 2016 07:14:34 -0500 Received: from edgewater-inn.cambridge.arm.com (edgewater-inn.cambridge.arm.com [10.1.203.121]) by cam-admin0.cambridge.arm.com (8.12.6/8.12.6) with ESMTP id u0RCERWr017082; Wed, 27 Jan 2016 12:14:27 GMT Received: by edgewater-inn.cambridge.arm.com (Postfix, from userid 1000) id 75F291AE137F; Wed, 27 Jan 2016 12:14:28 +0000 (GMT) From: Will Deacon To: stable@vger.kernel.org Cc: yang.shi@linaro.org, catalin.marinas@arm.com, gregkh@linuxfoundation.org, Will Deacon Subject: [PATCH] arm64: restore bogomips information in /proc/cpuinfo Date: Wed, 27 Jan 2016 12:14:27 +0000 Message-Id: <1453896867-19054-1-git-send-email-will.deacon@arm.com> X-Mailer: git-send-email 2.1.4 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org This is a backport of mainline commit 92e788b74986. 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") Cc: # 4.3 and earlier Signed-off-by: Will Deacon --- arch/arm64/kernel/setup.c | 4 ++++ 1 file changed, 4 insertions(+) -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 232247945b1c..9f17dc72645a 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -558,6 +558,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)