Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753827AbcCHNPQ (ORCPT ); Tue, 8 Mar 2016 08:15:16 -0500 Received: from torg.zytor.com ([198.137.202.12]:51616 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751315AbcCHNPF (ORCPT ); Tue, 8 Mar 2016 08:15:05 -0500 Date: Tue, 8 Mar 2016 05:14:07 -0800 From: tip-bot for Aravind Gopalakrishnan Message-ID: Cc: hpa@zytor.com, torvalds@linux-foundation.org, Aravind.Gopalakrishnan@amd.com, tony.luck@intel.com, linux-edac@vger.kernel.org, tglx@linutronix.de, peterz@infradead.org, mingo@kernel.org, bp@alien8.de, bp@suse.de, linux-kernel@vger.kernel.org Reply-To: bp@suse.de, linux-kernel@vger.kernel.org, peterz@infradead.org, bp@alien8.de, mingo@kernel.org, tglx@linutronix.de, Aravind.Gopalakrishnan@amd.com, torvalds@linux-foundation.org, hpa@zytor.com, linux-edac@vger.kernel.org, tony.luck@intel.com In-Reply-To: <1457021458-2522-5-git-send-email-Aravind.Gopalakrishnan@amd.com> References: <1457021458-2522-5-git-send-email-Aravind.Gopalakrishnan@amd.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:ras/core] x86/mce: Clarify comments regarding deferred error Git-Commit-ID: 2cd3b5f9033f0b051842a279dac5a54271cbd3c8 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 Content-Length: 1747 Lines: 42 Commit-ID: 2cd3b5f9033f0b051842a279dac5a54271cbd3c8 Gitweb: http://git.kernel.org/tip/2cd3b5f9033f0b051842a279dac5a54271cbd3c8 Author: Aravind Gopalakrishnan AuthorDate: Mon, 7 Mar 2016 14:02:20 +0100 Committer: Ingo Molnar CommitDate: Tue, 8 Mar 2016 11:48:15 +0100 x86/mce: Clarify comments regarding deferred error Deferred errors indicate errors that hardware could not fix. But it still does not cause any interruption to program flow. So it does not generate any #MC and UC bit in MCx_STATUS is not set. Correct comment. Signed-off-by: Aravind Gopalakrishnan Signed-off-by: Borislav Petkov Cc: Borislav Petkov Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Tony Luck Cc: linux-edac Link: http://lkml.kernel.org/r/1457021458-2522-5-git-send-email-Aravind.Gopalakrishnan@amd.com Signed-off-by: Ingo Molnar --- arch/x86/include/asm/mce.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h index 72f8688..cfff341 100644 --- a/arch/x86/include/asm/mce.h +++ b/arch/x86/include/asm/mce.h @@ -40,7 +40,7 @@ #define MCI_STATUS_AR (1ULL<<55) /* Action required */ /* AMD-specific bits */ -#define MCI_STATUS_DEFERRED (1ULL<<44) /* declare an uncorrected error */ +#define MCI_STATUS_DEFERRED (1ULL<<44) /* uncorrected error, deferred exception */ #define MCI_STATUS_POISON (1ULL<<43) /* access poisonous data */ #define MCI_STATUS_TCC (1ULL<<55) /* Task context corrupt */