Received: by 2002:a05:6a10:8395:0:0:0:0 with SMTP id n21csp426765pxh; Wed, 10 Nov 2021 04:05:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJyolQVQoNw2VWQgVVG+U6CevcPiyC5KdxXV2Zy/BNyPjKFKZDnsHdk8gZMnd3cEKaekrcwy X-Received: by 2002:a17:906:4f05:: with SMTP id t5mr20692945eju.68.1636545925711; Wed, 10 Nov 2021 04:05:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1636545925; cv=none; d=google.com; s=arc-20160816; b=DQc4/YhePK4Aab2UCxSmD+QAuMfdtXdU3er0YhW5utxKWEGSnqwvPQETuWVZxGvcKo /g19Acquu8+g6imR2Fs8ENPlHRDW9BV2+uhKYiT0tEYSxI0aDVqMbTaSxiw4UB4ZBsEN 4rj+qc0YglVKaVpdj9xBjIwadSiWH8E4ZrNKLLZMggN2vPG9kMwsTo2VMtxX/1Ead/Tx efMMe9VfidkXFEReEsKn75UnAQDvd8DSQ6kCQ5mvJ/Df3Ko9oM1zUoAAmnU4Zp7+gyAj +geFsSRjZXsM/O0UnbVHM4qHtKwZI2cBCXRkpYg7z90QOccRQnpjw8PLPivSR93QC2J2 6MMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=bSMOaLCNtk/o+WFzKTv0c1sQNsc4OBhAou3DAsLaqHI=; b=gj7R/SVJeCAU/Y/1l46Sk3sBr97yq4uijtv98a578tvcD9W/A3j0Q2M8ERVRoDASg4 0VwcxUYGf34L3HYdgwdaoPV/XkqhHkOWEwNthFKtW76/FefOHWBd47hieY6iYYSSyJCE cncpBXbAcdC0y4FjyRj7hhaE/kHuL50a3Tg4bcs5CZ6faa3Od1cX5NnIt+Wc47sFO5F2 jPZJlkIWGecSC/vIVi3OU7wn4rOVroi6Nv+d7gISW1jcqgurtLPAEDL8NGKwGFkCzM+a SNNF7YU61iYU3TKdQiT92dnm2sdXLMIAr1KONAsNHB7Sd+R+pxrGwGmtyPsq4tPYMTjR cBuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b="QH+TNYu/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id eb14si34503863edb.148.2021.11.10.04.04.59; Wed, 10 Nov 2021 04:05:25 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b="QH+TNYu/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231959AbhKJME3 (ORCPT + 99 others); Wed, 10 Nov 2021 07:04:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36254 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231876AbhKJME1 (ORCPT ); Wed, 10 Nov 2021 07:04:27 -0500 Received: from mail-pf1-x432.google.com (mail-pf1-x432.google.com [IPv6:2607:f8b0:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4B7F2C061764 for ; Wed, 10 Nov 2021 04:01:40 -0800 (PST) Received: by mail-pf1-x432.google.com with SMTP id c4so2480347pfj.2 for ; Wed, 10 Nov 2021 04:01:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bSMOaLCNtk/o+WFzKTv0c1sQNsc4OBhAou3DAsLaqHI=; b=QH+TNYu/B6ZwOmohwTLVvm3H/+0mNG7bwoQxccgJn4jMJ1UOpZwvMpXyMAhnfrBPgz YLIvHGZwsi75p6zA9W1LnWvIOPZ2pgtmjQU94QbQF+9zRiwgZ8icTK4ZWGTZlq8tM3Kf ZvdCDXy6Rzy/7rGwMq2/OdevX31o7lcqpxHYygtStBvn9s38g6FQgK0eU+ckcmDWrnGY A8vVu3oI9udgqBLpS4Sibprv4DfAd5/3EYX/+9zIfzB/rAizRFMfal97zc3kp9EwAnK/ UaZrZyAsyLyuVd4EZAYNiY/eqvqLYgeXzA9dgy6gxd/h+RlAtyxftqL/eTy3FLfNFOHX ZZVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bSMOaLCNtk/o+WFzKTv0c1sQNsc4OBhAou3DAsLaqHI=; b=i9yRffjWb7wH5CJ/frt52ndRDhZwHPDSvMf5SS9u+Rxbav3TU3jXhukZDjPBaQzAbk LfiWpHyxxauPAC3oZLKpCn7mPntlcpdx8FR9+FHmvWyMBSpE4TeeA95E2lnqlj+Ij71Y z0huGJ0IROYGCo3RukwFysB4uvohhUh0BBcdZBs2gJ3JKdUmvZ2fn2jxsVvU11WXvs9J iKdfTRilJze4kW7HVdWofOX04D4qD3T7yShyN91FZvhEHSjQT5QnTZqZXJ5t6HNMxTrJ Y0IbpY87MzuZm9YHZcRV6GeFRgD54lZDbz7wcYkyFrrFNlzuibhVtu1yqReUbBDVCLcl ijmw== X-Gm-Message-State: AOAM53081WIMGvDqwXC4qYCiIzB4YI64ixO8HFTSXP8D4pvDE8YizQU9 kWil89NE9iXlFo5N8gQR3Xxr+5qunYQ= X-Received: by 2002:a05:6a00:2ab:b0:49f:997e:23e2 with SMTP id q11-20020a056a0002ab00b0049f997e23e2mr15976817pfs.22.1636545699736; Wed, 10 Nov 2021 04:01:39 -0800 (PST) Received: from localhost ([198.11.178.15]) by smtp.gmail.com with ESMTPSA id f19sm2913817pfc.122.2021.11.10.04.01.38 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Nov 2021 04:01:39 -0800 (PST) From: Lai Jiangshan To: linux-kernel@vger.kernel.org Cc: x86@kernel.org, Lai Jiangshan , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , Juergen Gross , "Peter Zijlstra (Intel)" , Joerg Roedel Subject: [PATCH V5 40/50] x86/idtentry.h: Move the definitions *IDTENTRY_{MCE|DEBUG}* up Date: Wed, 10 Nov 2021 19:57:26 +0800 Message-Id: <20211110115736.3776-41-jiangshanlai@gmail.com> X-Mailer: git-send-email 2.19.1.6.gb485710b In-Reply-To: <20211110115736.3776-1-jiangshanlai@gmail.com> References: <20211110115736.3776-1-jiangshanlai@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Lai Jiangshan Move them closer to the related definitions and reduce a #ifdef entry. Signed-off-by: Lai Jiangshan --- arch/x86/include/asm/idtentry.h | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/arch/x86/include/asm/idtentry.h b/arch/x86/include/asm/idtentry.h index d0fd32288442..b9a6750dbba2 100644 --- a/arch/x86/include/asm/idtentry.h +++ b/arch/x86/include/asm/idtentry.h @@ -372,6 +372,14 @@ __visible __entry_text void ist_##func(struct pt_regs *regs) \ #define DEFINE_IDTENTRY_NOIST(func) \ DEFINE_IDTENTRY_RAW(noist_##func) +#define DECLARE_IDTENTRY_MCE DECLARE_IDTENTRY_IST +#define DEFINE_IDTENTRY_MCE DEFINE_IDTENTRY_IST +#define DEFINE_IDTENTRY_MCE_USER DEFINE_IDTENTRY_NOIST + +#define DECLARE_IDTENTRY_DEBUG DECLARE_IDTENTRY_IST +#define DEFINE_IDTENTRY_DEBUG DEFINE_IDTENTRY_IST +#define DEFINE_IDTENTRY_DEBUG_USER DEFINE_IDTENTRY_NOIST + /** * DECLARE_IDTENTRY_DF - Declare functions for double fault * @vector: Vector number (ignored for C) @@ -446,16 +454,6 @@ __visible noinstr void func(struct pt_regs *regs, \ #define DECLARE_IDTENTRY_NMI DECLARE_IDTENTRY_RAW #define DEFINE_IDTENTRY_NMI DEFINE_IDTENTRY_RAW -#ifdef CONFIG_X86_64 -#define DECLARE_IDTENTRY_MCE DECLARE_IDTENTRY_IST -#define DEFINE_IDTENTRY_MCE DEFINE_IDTENTRY_IST -#define DEFINE_IDTENTRY_MCE_USER DEFINE_IDTENTRY_NOIST - -#define DECLARE_IDTENTRY_DEBUG DECLARE_IDTENTRY_IST -#define DEFINE_IDTENTRY_DEBUG DEFINE_IDTENTRY_IST -#define DEFINE_IDTENTRY_DEBUG_USER DEFINE_IDTENTRY_NOIST -#endif - #else /* !__ASSEMBLY__ */ /* -- 2.19.1.6.gb485710b