From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756124AbZEZXzZ (ORCPT ); Tue, 26 May 2009 19:55:25 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755670AbZEZXym (ORCPT ); Tue, 26 May 2009 19:54:42 -0400 Received: from one.firstfloor.org ([213.235.205.2]:38582 "EHLO one.firstfloor.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754726AbZEZXyl (ORCPT ); Tue, 26 May 2009 19:54:41 -0400 From: Andi Kleen To: linux-kernel@vger.kernel.org, hpa@zytor.com, x86@kernel.org Cc: Huang Ying , Andi Kleen Subject: [PATCH 03/31] x86: MCE: Fix EIPV behaviour with !PCC Date: Wed, 27 May 2009 01:54:05 +0200 Message-Id: <6c6d1f8bbbd2312884dca5a5c75aa5f5a87dae4b.1243381848.git.ak@linux.intel.com> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: References: <1243382073-29338-1-git-send-email-andi@firstfloor.org> In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Huang Ying Impact: Spec compliance When tolerant == 0, system should go panic instead of send SIGBUS even for a MCE with EPIV && !PCC on user space. Signed-off-by: Huang Ying Signed-off-by: Andi Kleen --- arch/x86/kernel/cpu/mcheck/mce.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c index 3f158d7..e1271ac 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c @@ -485,7 +485,7 @@ void do_machine_check(struct pt_regs *regs, long error_code) * force_sig() takes an awful lot of locks and has a slight * risk of deadlocking. */ - if (user_space) { + if (user_space && tolerant > 0) { force_sig(SIGBUS, current); } else if (panic_on_oops || tolerant < 2) { mce_panic("Uncorrected machine check", -- 1.6.0.2