Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp412654imm; Thu, 26 Jul 2018 05:58:37 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcgOKKdaIBi0evxqvf4vr88SdgP9OAvUZdeCt70dlfp/ndg2b6/GR05y9WmtIA8UFqItmqj X-Received: by 2002:a63:1015:: with SMTP id f21-v6mr1897490pgl.354.1532609917055; Thu, 26 Jul 2018 05:58:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532609917; cv=none; d=google.com; s=arc-20160816; b=f4yS1v64bLaXx14qoAaCm+TUCJFzzogjqdQizF/N79SNaNrISQNK/3/1KRWRKqfdys n6vWg+OhqncdgRC5k6Sr0Dpbiec7ryJu3ge1va9ORYvu3QcJx4LZv5PQmP3MnyAq97g+ iJiyai8Yxcf/yc127/VbrgrXq5QorRhcMHXWLywfcUI8iSlqwZ8Ndst5IDX/NoixeUZG bYQ+Yn+cLC/VXS9PkPb6k3RXgsFRzV/VzyJE9t+gRGK2MIIosFnYFuA0UJDCS4k+KxXK KqTADR9O8IpVk1WJou9j2sxSpgb148Dt/psX4r6HXRfCt66gnX7BTUtlWrHovF7xXQv7 mbnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:date:subject:to :from:arc-authentication-results; bh=z99dZwkPhYSHRZO7cqgHpQsasvUqlmXmBtmrMZeDfrw=; b=qSiVui8HMnvz7g3q/wz+Xfw4CXEAnYd2KmZhnhvTC0hWq4J/K85j2SuFoQ6wz/KIR0 C7vT/5IV8N6VMSKyIiqSrs+d+OgdFdrxl3AOhwv4oQjEihc1gO05Nq8/Rs5Upa4Ike8T URvt9lCR93cJAli+bs+kjZlbv7CqUYw123z3YXRwODu4MzgN2wuASm+dG+nkRAiN5hYe XyvKPKtGdSR+BQb42OzNwxsnjeesIrUaE6mv41uDZcRbchGAd7oayxt6NSchn2Y9fJC0 BvS/eIa7zW3GUq9Uc55bsqayzhmFMEv2sNMVCRTZ065NfbD+37mGRVFInHT4nESINy2l acwg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p13-v6si1174161pgg.616.2018.07.26.05.58.22; Thu, 26 Jul 2018 05:58:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730794AbeGZONb (ORCPT + 99 others); Thu, 26 Jul 2018 10:13:31 -0400 Received: from szxga07-in.huawei.com ([45.249.212.35]:37748 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729510AbeGZONa (ORCPT ); Thu, 26 Jul 2018 10:13:30 -0400 Received: from DGGEMS414-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 6328DBFF2DA0D; Thu, 26 Jul 2018 20:56:41 +0800 (CST) Received: from localhost.localdomain (10.143.28.90) by DGGEMS414-HUB.china.huawei.com (10.3.19.214) with Microsoft SMTP Server id 14.3.382.0; Thu, 26 Jul 2018 20:56:32 +0800 From: Dongjiu Geng To: , , , , , , , , , , , Subject: [PATCH] arm64: clean the additional checks before calling ghes_notify_sea() Date: Thu, 26 Jul 2018 17:01:47 -0400 Message-ID: <1532638907-46129-1-git-send-email-gengdongjiu@huawei.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.143.28.90] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In order to remove the additional check before calling the ghes_notify_sea(), make stub definition when !CONFIG_ACPI_APEI_SEA. Signed-off-by: Dongjiu Geng --- This cleanup is ever mentioned by Mark Rutland in [1] [1]: https://lkml.org/lkml/2018/5/31/289 --- arch/arm64/mm/fault.c | 7 +------ include/acpi/ghes.h | 4 ++++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index b8eecc7..9ffe01d 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -727,12 +727,7 @@ static int do_sea(unsigned long addr, unsigned int esr, struct pt_regs *regs) int handle_guest_sea(phys_addr_t addr, unsigned int esr) { - int ret = -ENOENT; - - if (IS_ENABLED(CONFIG_ACPI_APEI_SEA)) - ret = ghes_notify_sea(); - - return ret; + return ghes_notify_sea(); } asmlinkage void __exception do_mem_abort(unsigned long addr, unsigned int esr, diff --git a/include/acpi/ghes.h b/include/acpi/ghes.h index 1624e2b..82cb4eb 100644 --- a/include/acpi/ghes.h +++ b/include/acpi/ghes.h @@ -118,6 +118,10 @@ static inline void *acpi_hest_get_next(struct acpi_hest_generic_data *gdata) (void *)section - (void *)(estatus + 1) < estatus->data_length; \ section = acpi_hest_get_next(section)) +#ifdef CONFIG_ACPI_APEI_SEA int ghes_notify_sea(void); +#else +static inline int ghes_notify_sea(void) { return -ENOENT; } +#endif #endif /* GHES_H */ -- 1.9.1