Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757708Ab1EWWM7 (ORCPT ); Mon, 23 May 2011 18:12:59 -0400 Received: from mga09.intel.com ([134.134.136.24]:15833 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753285Ab1EWWM5 (ORCPT ); Mon, 23 May 2011 18:12:57 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.65,258,1304319600"; d="scan'208";a="3539129" From: "Luck, Tony" To: linux-kernel@vger.kernel.org Cc: "Ingo Molnar" , "Huang, Ying" , "Andi Kleen" , "Borislav Petkov" , "Linus Torvalds" , "Andrew Morton" In-Reply-To: <4ddad79317108eb33d@agluck-desktop.sc.intel.com> Subject: [RFC 2/9] mce: save most severe error information Date: Mon, 23 May 2011 15:12:57 -0700 Message-Id: <4ddadbe91716015857@agluck-desktop.sc.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1331 Lines: 41 From: Tony Luck monarch clears all of the per cpu "mces_seen", so we must keep a copy to use after mce_end() Signed-off-by: Tony Luck --- arch/x86/kernel/cpu/mcheck/mce.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c index 3385ea2..ed1542a 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c @@ -1046,6 +1046,9 @@ void do_machine_check(struct pt_regs *regs, long error_code) } } + /* Save our worst error locally, monarch will clear mces_seen */ + m = *final; + if (!no_way_out) mce_clear_state(toclear); @@ -1064,7 +1067,7 @@ void do_machine_check(struct pt_regs *regs, long error_code) * support MCE broadcasting or it has been disabled. */ if (no_way_out && tolerant < 3) - mce_panic("Fatal machine check on current CPU", final, msg); + mce_panic("Fatal machine check on current CPU", &m, msg); /* * If the error seems to be unrecoverable, something should be -- 1.7.3.1 -- 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/