From patchwork Sat Sep 23 09:41:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Xin3" X-Patchwork-Id: 143965 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp298253vqu; Sat, 23 Sep 2023 10:35:42 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGEzq/Q1nWb7NAYV63XxZfxE4clYmAxP/CRP4xIWm3sJ5mqwM6W+F41e+lw4kDFadWKx29q X-Received: by 2002:a05:6a21:18a:b0:14c:83a0:2aa with SMTP id le10-20020a056a21018a00b0014c83a002aamr2740073pzb.53.1695490542639; Sat, 23 Sep 2023 10:35:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695490542; cv=none; d=google.com; s=arc-20160816; b=0s7D1y3sSiCIfSTpW6QqLDb/Z7O3hRvjgw+IF8ymjXQSnBQWrYKnh0VfCWpqXX7ZjJ bX4K+SldYX8q+iTrOE+uFOvaLIdhk065ozu/E3zpp7schRwwKdnx2rK12OEMqsEArxu9 MxNspIL6QIek6a9Ec9nR/5h/5o3rID4LZvEdpE//6rNWRxP+g8ZzYvgXi7Y6pe++w793 Zrc7ZZVMu6TblqivFq6BMXu/7P1CUurX8qdBbW7etayzbKzTDIJf99Z6rTe7SL1HIS72 4Fw3Crw6HMJQ2iZPOElGWiXge+bf6PTT7r9Hj7JU+k6CkoGYA32DmgwY+PzvlAOf4TzZ E4Bw== 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=RXN8BdOBDTxiJTHkvHAzH4cOK69PZTABVtm+q+g7aD4=; fh=Tb1p8S3iOxe/kX/WSNC3xEJzSVgGJ5DaxSrKb+pzH+4=; b=R/l3byITO5e80rZUBrrO6LH1MFDRZwoAbkwKX/A1Z8fui6Zvr3LcHWf1BpVXIpm6aj xbpn3RWdmsN4KZ9pmLEutWsQRRulJLGxLnN7DJb+IIad3nFBxMCibs3GGXwYp0uUknDl n31BV/L5kuyb22tn3Ud6J4Ug0MUcjSmDwhSO6TwdnAdMsbhyOyC1kt/FyX5p3AW9eBtt tUfPL6XbFlWqjnqv0YwRtXGKCaw+Fvw5R11MiApXyygbHzeZcKBAKwDOhPslwTsRucKy G/uzeexqyuRsxv/VwcFyKsKWI6K9wgsaUqtXIj5yCfI3MY1pkrqxC66dCGCAkmNnsoLj dSWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=JxYKJ9uZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id t16-20020a170902e85000b001c33cde7b3asi7061722plg.410.2023.09.23.10.35.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Sep 2023 10:35:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=JxYKJ9uZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 2965983513A1; Sat, 23 Sep 2023 03:12:31 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231136AbjIWKMD (ORCPT + 29 others); Sat, 23 Sep 2023 06:12:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42318 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231297AbjIWKLq (ORCPT ); Sat, 23 Sep 2023 06:11:46 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 186B41A6; Sat, 23 Sep 2023 03:11:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1695463900; x=1726999900; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=IuyTaHxTCpXU3koACAwE/wPTCk5NNVb2w/wLiweVXto=; b=JxYKJ9uZpHaXO5FTA7j/6SAW6gdREbxrzFswoFTUh26w26T8OhAXdBw3 aVOxQNiZTsix/uoGj4p5Fa0uW3N/1DwknozHSAlvOkeXmjIt3zAQawzIc SRPJBVV0cDkqwIK6Al2Ii5m7jHdsGbavZ1JLqPp36JkLO+8GLsFmtwuY2 1SXAyC+ECGG1rtxjbizXI1MQDKkL+CS8fnrbzq3IRPNKqgs5B+gY8GCJa 5LjPrS2jnzW+f9tJPC/XriBTwZACZmab96thJnwKGpsvZm4K0o0q0U1DP RxfCTfyatyDtVS7C0QIehx0RnxFt/CM2NROiVJIoDRGQ2gjg+a5f4vZv/ g==; X-IronPort-AV: E=McAfee;i="6600,9927,10841"; a="447492119" X-IronPort-AV: E=Sophos;i="6.03,171,1694761200"; d="scan'208";a="447492119" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Sep 2023 03:11:38 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10841"; a="813388110" X-IronPort-AV: E=Sophos;i="6.03,171,1694761200"; d="scan'208";a="813388110" Received: from unknown (HELO fred..) ([172.25.112.68]) by fmsmga008.fm.intel.com with ESMTP; 23 Sep 2023 03:11:37 -0700 From: Xin Li To: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-edac@vger.kernel.org, linux-hyperv@vger.kernel.org, kvm@vger.kernel.org, xen-devel@lists.xenproject.org Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, luto@kernel.org, pbonzini@redhat.com, seanjc@google.com, peterz@infradead.org, jgross@suse.com, ravi.v.shankar@intel.com, mhiramat@kernel.org, andrew.cooper3@citrix.com, jiangshanlai@gmail.com, nik.borisov@suse.com Subject: [PATCH v11 04/37] x86/entry: Remove idtentry_sysvec from entry_{32,64}.S Date: Sat, 23 Sep 2023 02:41:39 -0700 Message-Id: <20230923094212.26520-5-xin3.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230923094212.26520-1-xin3.li@intel.com> References: <20230923094212.26520-1-xin3.li@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=2.7 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Sat, 23 Sep 2023 03:12:31 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777850691247085964 X-GMAIL-MSGID: 1777850691247085964 idtentry_sysvec is really just DECLARE_IDTENTRY defined in , no need to define it separately. Tested-by: Shan Kang Signed-off-by: Xin Li --- arch/x86/entry/entry_32.S | 4 ---- arch/x86/entry/entry_64.S | 8 -------- arch/x86/include/asm/idtentry.h | 2 +- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S index 6e6af42e044a..e0f22ad8ff7e 100644 --- a/arch/x86/entry/entry_32.S +++ b/arch/x86/entry/entry_32.S @@ -649,10 +649,6 @@ SYM_CODE_START_LOCAL(asm_\cfunc) SYM_CODE_END(asm_\cfunc) .endm -.macro idtentry_sysvec vector cfunc - idtentry \vector asm_\cfunc \cfunc has_error_code=0 -.endm - /* * Include the defines which emit the idt entries which are shared * shared between 32 and 64 bit and emit the __irqentry_text_* markers diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index f71664dea1a3..179e08d34eb6 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -432,14 +432,6 @@ SYM_CODE_END(\asmsym) idtentry \vector asm_\cfunc \cfunc has_error_code=1 .endm -/* - * System vectors which invoke their handlers directly and are not - * going through the regular common device interrupt handling code. - */ -.macro idtentry_sysvec vector cfunc - idtentry \vector asm_\cfunc \cfunc has_error_code=0 -.endm - /** * idtentry_mce_db - Macro to generate entry stubs for #MC and #DB * @vector: Vector number diff --git a/arch/x86/include/asm/idtentry.h b/arch/x86/include/asm/idtentry.h index 05fd175cec7d..cfca68f6cb84 100644 --- a/arch/x86/include/asm/idtentry.h +++ b/arch/x86/include/asm/idtentry.h @@ -447,7 +447,7 @@ __visible noinstr void func(struct pt_regs *regs, \ /* System vector entries */ #define DECLARE_IDTENTRY_SYSVEC(vector, func) \ - idtentry_sysvec vector func + DECLARE_IDTENTRY(vector, func) #ifdef CONFIG_X86_64 # define DECLARE_IDTENTRY_MCE(vector, func) \