From patchwork Wed Apr 9 15:14:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Nowicki X-Patchwork-Id: 3956151 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8AB0DBFF02 for ; Wed, 9 Apr 2014 15:14:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 91BC220595 for ; Wed, 9 Apr 2014 15:14:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C407E205CB for ; Wed, 9 Apr 2014 15:14:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933809AbaDIPOY (ORCPT ); Wed, 9 Apr 2014 11:14:24 -0400 Received: from mail-ee0-f50.google.com ([74.125.83.50]:46036 "EHLO mail-ee0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964806AbaDIPOU (ORCPT ); Wed, 9 Apr 2014 11:14:20 -0400 Received: by mail-ee0-f50.google.com with SMTP id c13so2002825eek.37 for ; Wed, 09 Apr 2014 08:14:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=BvUgzj9Vkdj/5yERoTVzfxWTCFdgrWMC5zX3FdwTu3o=; b=eMMgInewjLHvKOdlJWYhG/9A9p1JqV8AEfDbBt/Jg5Ro2jpZIZFr6KEoMqCwdwGBhl DLtgypnbRm3g/ReLAiwEOi/4TFmtMTsd4s0v9eyCLXaJc1qKuws8FWZRzqjAedNn7JB7 Qgo4KDom0R3TkdchqmzgtvJWuAjDf16O9lUkB24UbjQID8ck3qJxO3DMSakAeXhiear9 eza5m0HxKlGvT5lUzHGSW5cRnupXS4gAW1YE7vpm3TV1VJgPOEc8HxW3euC1x3gqGwK9 Nc0MOJs+51CuiZmaOrpT2eZh2xbI4ptT6VPNk/bT7dI5K22AuBG8gWRcU3C0szieJQhL v/Hg== X-Gm-Message-State: ALoCoQk7pVJAeV4uS8uf0GMGVRz+1dIU2bw85JqsiCIrkUlEg/l6+v09vyQmHpgGYyL/5WoAfL2P X-Received: by 10.14.216.2 with SMTP id f2mr674497eep.83.1397056458624; Wed, 09 Apr 2014 08:14:18 -0700 (PDT) Received: from tn-HP3-PC.semihalf.com ([80.82.22.190]) by mx.google.com with ESMTPSA id x46sm2326082een.17.2014.04.09.08.14.16 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 09 Apr 2014 08:14:18 -0700 (PDT) From: Tomasz Nowicki To: rjw@rjwysocki.net, lenb@kernel.org, tony.luck@intel.com, bp@alien8.de, bp@suse.de, m.chehab@samsung.com Cc: linux-edac@vger.kernel.org, x86@kernel.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linaro-acpi@lists.linaro.org, Tomasz Nowicki Subject: [PATCH 1/7] apei, mce: Call MCE-specific code only for X86 architecture. Date: Wed, 9 Apr 2014 17:14:29 +0200 Message-Id: <1397056476-9183-2-git-send-email-tomasz.nowicki@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1397056476-9183-1-git-send-email-tomasz.nowicki@linaro.org> References: <1397056476-9183-1-git-send-email-tomasz.nowicki@linaro.org> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This commit is dealing with MCE code in: - hest.c Move acpi_disable_cmcff flag to hest_parse_cmc() and makes that depend on CONFIG_X86_MCE so that we do not have to maintain acpi_disable_cmcff for architectures which do not support MCE. Also, wrap architectural MCE header inside #ifdef CONFIG_X86_MCE. - ghes.c Wrap architectural MCE header inside #ifdef CONFIG_X86_MCE similar to rest of the MCE code in this file. Signed-off-by: Tomasz Nowicki --- drivers/acpi/apei/ghes.c | 2 ++ drivers/acpi/apei/hest.c | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c index dab7cb7..f7edffc 100644 --- a/drivers/acpi/apei/ghes.c +++ b/drivers/acpi/apei/ghes.c @@ -49,7 +49,9 @@ #include #include +#ifdef CONFIG_X86_MCE #include +#endif #include #include diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c index f5e37f3..98db702 100644 --- a/drivers/acpi/apei/hest.c +++ b/drivers/acpi/apei/hest.c @@ -36,7 +36,9 @@ #include #include #include +#ifdef CONFIG_X86_MCE #include +#endif #include "apei-internal.h" @@ -133,6 +135,9 @@ static int __init hest_parse_cmc(struct acpi_hest_header *hest_hdr, void *data) struct acpi_hest_ia_corrected *cmc; struct acpi_hest_ia_error_bank *mc_bank; + if (acpi_disable_cmcff) + return 1; + if (hest_hdr->type != ACPI_HEST_TYPE_IA32_CORRECTED_CHECK) return 0; @@ -263,8 +268,7 @@ void __init acpi_hest_init(void) goto err; } - if (!acpi_disable_cmcff) - apei_hest_parse(hest_parse_cmc, NULL); + apei_hest_parse(hest_parse_cmc, NULL); if (!ghes_disable) { rc = apei_hest_parse(hest_parse_ghes_count, &ghes_count);