From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751628AbcEJIlN (ORCPT ); Tue, 10 May 2016 04:41:13 -0400 Received: from terminus.zytor.com ([198.137.202.10]:46736 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751129AbcEJIlK (ORCPT ); Tue, 10 May 2016 04:41:10 -0400 Date: Tue, 10 May 2016 01:40:04 -0700 From: tip-bot for Borislav Petkov Message-ID: Cc: tglx@linutronix.de, hpa@zytor.com, torvalds@linux-foundation.org, bp@suse.de, bp@alien8.de, brgerst@gmail.com, linux-kernel@vger.kernel.org, peterz@infradead.org, mingo@kernel.org, dvlasenk@redhat.com, luto@amacapital.net Reply-To: bp@suse.de, tglx@linutronix.de, torvalds@linux-foundation.org, hpa@zytor.com, peterz@infradead.org, linux-kernel@vger.kernel.org, luto@amacapital.net, dvlasenk@redhat.com, mingo@kernel.org, brgerst@gmail.com, bp@alien8.de In-Reply-To: <1462733920-7224-1-git-send-email-bp@alien8.de> References: <1462733920-7224-1-git-send-email-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/cpu] x86/cpu: Correct comments and messages in P4 erratum 037 handling code Git-Commit-ID: f0133acc7d4835cfbb86393b7d2a4fba7519585b X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: f0133acc7d4835cfbb86393b7d2a4fba7519585b Gitweb: http://git.kernel.org/tip/f0133acc7d4835cfbb86393b7d2a4fba7519585b Author: Borislav Petkov AuthorDate: Sun, 8 May 2016 20:58:40 +0200 Committer: Ingo Molnar CommitDate: Tue, 10 May 2016 10:05:03 +0200 x86/cpu: Correct comments and messages in P4 erratum 037 handling code Remove the linebreak in the conditional and s/errata/erratum/ as the singular is "erratum". No functionality change. Signed-off-by: Borislav Petkov Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1462733920-7224-1-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar --- arch/x86/kernel/cpu/intel.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index f71a349..5354080 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c @@ -263,15 +263,14 @@ static void intel_workarounds(struct cpuinfo_x86 *c) } /* - * P4 Xeon errata 037 workaround. + * P4 Xeon erratum 037 workaround. * Hardware prefetcher may cause stale data to be loaded into the cache. */ if ((c->x86 == 15) && (c->x86_model == 1) && (c->x86_mask == 1)) { if (msr_set_bit(MSR_IA32_MISC_ENABLE, - MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE_BIT) - > 0) { + MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE_BIT) > 0) { pr_info("CPU: C0 stepping P4 Xeon detected.\n"); - pr_info("CPU: Disabling hardware prefetching (Errata 037)\n"); + pr_info("CPU: Disabling hardware prefetching (Erratum 037)\n"); } }