Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752323AbbBWJPH (ORCPT ); Mon, 23 Feb 2015 04:15:07 -0500 Received: from TYO201.gate.nec.co.jp ([210.143.35.51]:63550 "EHLO tyo201.gate.nec.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752186AbbBWJPA convert rfc822-to-8bit (ORCPT ); Mon, 23 Feb 2015 04:15:00 -0500 From: Naoya Horiguchi To: Tony Luck , Borislav Petkov CC: Vivek Goyal , "linux-kernel@vger.kernel.org" , Junichi Nomura , Kiyoshi Ueda Subject: [PATCH 2/2] x86: mce: comment about MCE synchronization timeout on definition of tolerant Thread-Topic: [PATCH 2/2] x86: mce: comment about MCE synchronization timeout on definition of tolerant Thread-Index: AQHQT0jZTCxNj4gklUGnp1ZRPZifWQ== Date: Mon, 23 Feb 2015 09:12:29 +0000 Message-ID: <1424682719-16493-2-git-send-email-n-horiguchi@ah.jp.nec.com> References: <1424682719-16493-1-git-send-email-n-horiguchi@ah.jp.nec.com> In-Reply-To: <1424682719-16493-1-git-send-email-n-horiguchi@ah.jp.nec.com> Accept-Language: ja-JP, en-US Content-Language: ja-JP X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.128.101.18] Content-Type: text/plain; charset="iso-2022-jp" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1404 Lines: 32 commit 716079f66eac ("mce: Panic when a core has reached a timeout") changed the behavior of mca_cfg->tolerant. So let's add comment about it. Signed-off-by: Naoya Horiguchi --- arch/x86/kernel/cpu/mcheck/mce.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git v3.19.orig/arch/x86/kernel/cpu/mcheck/mce.c v3.19/arch/x86/kernel/cpu/mcheck/mce.c index 3a155b9e276e..2dc93bd62bbc 100644 --- v3.19.orig/arch/x86/kernel/cpu/mcheck/mce.c +++ v3.19/arch/x86/kernel/cpu/mcheck/mce.c @@ -69,8 +69,10 @@ struct mca_config mca_cfg __read_mostly = { /* * Tolerant levels: * 0: always panic on uncorrected errors, log corrected errors - * 1: panic or SIGBUS on uncorrected errors, log corrected errors - * 2: SIGBUS or log uncorrected errors (if possible), log corr. errors + * 1: panic or SIGBUS on uncorrected errors, log corrected errors, + * panic on MCE synchronization timeout. + * 2: SIGBUS or log uncorrected errors (if possible), log corr. errors, + * no panic on MCE synchronization timeout. * 3: never panic or SIGBUS, log all errors (for testing only) */ .tolerant = 1, -- 1.9.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/