From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753273AbbCaUzn (ORCPT ); Tue, 31 Mar 2015 16:55:43 -0400 Received: from mail-bn1on0112.outbound.protection.outlook.com ([157.56.110.112]:61152 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752175AbbCaUzk (ORCPT ); Tue, 31 Mar 2015 16:55:40 -0400 Authentication-Results: spf=none (sender IP is 165.204.84.221) smtp.mailfrom=amd.com; alien8.de; dkim=none (message not signed) header.d=none; X-WSS-ID: 0NM3GSM-07-3JI-02 X-M-MSG: From: Aravind Gopalakrishnan To: , , , , , , , CC: Aravind Gopalakrishnan Subject: [PATCH] x86, mce, severity: Fix warning about intended braces Date: Tue, 31 Mar 2015 10:04:41 -0500 Message-ID: <1427814281-18192-1-git-send-email-Aravind.Gopalakrishnan@amd.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:165.204.84.221;CTRY:US;IPV:NLI;EFV:NLI;BMV:1;SFV:NSPM;SFS:(10019020)(6009001)(189002)(199003)(19580405001)(106466001)(77156002)(229853001)(62966003)(77096005)(105586002)(50226001)(2201001)(86362001)(87936001)(50466002)(48376002)(46102003)(92566002)(19580395003)(53416004)(50986999)(101416001)(36756003)(47776003);DIR:OUT;SFP:1102;SCL:1;SRVR:BN3PR0201MB0884;H:atltwp01.amd.com;FPR:;SPF:None;MLV:sfv;MX:1;A:1;LANG:en; X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN3PR0201MB0884; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(5002010)(5005006);SRVR:BN3PR0201MB0884;BCL:0;PCL:0;RULEID:;SRVR:BN3PR0201MB0884; X-Forefront-PRVS: 0532BF6DC2 X-OriginatorOrg: amd4.onmicrosoft.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Mar 2015 20:55:36.8635 (UTC) X-MS-Exchange-CrossTenant-Id: fde4dada-be84-483f-92cc-e026cbee8e96 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=fde4dada-be84-483f-92cc-e026cbee8e96;Ip=[165.204.84.221];Helo=[atltwp01.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR0201MB0884 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Dan reported compiler warnings about intended curly braces around if (!(m->mcgstatus & MCG_STATUS_RIPV)). This can be fixed by reindenting return MCE_AR_SEVERITY correctly to single tab. While at it, chain ctx == IN_KERNEL check with mcgstatus check to make it cleaner as suggested by Boris. No functional changes are introduced by the patch Reported-by: Dan Carpenter Signed-off-by: Aravind Gopalakrishnan --- arch/x86/kernel/cpu/mcheck/mce-severity.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/x86/kernel/cpu/mcheck/mce-severity.c b/arch/x86/kernel/cpu/mcheck/mce-severity.c index 155c926..8329c6b 100644 --- a/arch/x86/kernel/cpu/mcheck/mce-severity.c +++ b/arch/x86/kernel/cpu/mcheck/mce-severity.c @@ -208,12 +208,12 @@ static int mce_severity_amd(struct mce *m, int tolerant, char **msg, bool is_exc */ if (mce_flags.overflow_recov) { /* software can try to contain */ - if (!(m->mcgstatus & MCG_STATUS_RIPV)) - if (ctx == IN_KERNEL) - return MCE_PANIC_SEVERITY; + if (!(m->mcgstatus & MCG_STATUS_RIPV) && + ctx == IN_KERNEL) + return MCE_PANIC_SEVERITY; - /* kill current process */ - return MCE_AR_SEVERITY; + /* kill current process */ + return MCE_AR_SEVERITY; } else { /* at least one error was not logged */ if (m->status & MCI_STATUS_OVER) -- 1.9.1