From patchwork Tue Nov 21 08:43:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 167554 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2b07:b0:403:3b70:6f57 with SMTP id io7csp481161vqb; Tue, 21 Nov 2023 00:43:38 -0800 (PST) X-Google-Smtp-Source: AGHT+IF0OLQyLEGKszLROQpytSmBYAR5uouVPoDaQCHHfafg90NQ4YmBYj4F3JqfoxLGtjJ09FkO X-Received: by 2002:a05:6870:5d89:b0:1f9:6877:ff45 with SMTP id fu9-20020a0568705d8900b001f96877ff45mr1599787oab.51.1700556218080; Tue, 21 Nov 2023 00:43:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700556218; cv=none; d=google.com; s=arc-20160816; b=Ry+oXAutlVF3/+nSVfUoi9V8YlCfSEgemCXuZjJxmSb07oPatuNkiF18dvDsdeKXkv i32DmYRKzkP9e/JIbid4bWCSn0rHNmGmcrhm2wN4pEpxjcf4Yxiiuqnp75G32U22z60t jZ3DAoP0d4FMrlY0FQBhJqNNuAeMoTQ+x8vCCFq1bWqhw5H2X4AxbvQjjNxJ8AQke6oe sWoy2AYMHkV4SPH6MkIBAByRbhtH7wPamlvh4qzbWaMTbhZTShNgFJKQgXvnVJtI9+Ju KIzs6pRmziQbeIspivgbZzh20EnRNunkuzow0ryKiJlIdGnQRRCyzM6PlgDHHDWeyb78 wdfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=tQQaceoHAxtmKdnMRuCtP57MdrImWR4O7cyjfd4snZo=; fh=ScvJvqRa2aHxCSmMbwVh56omD/NnS1ZEKbth6BzcuHY=; b=kSPEs+YfsKKR8+12u3rJpY0ywoeDZFf+7r/2oYwXI2aeET8xHyJiptljILTO5ANSsA IK0PsbynyEPIynMaWUjxS75ZAhwRFiLtvJQyZnkcxBRJFZ20ESVahRtJ9QMuul9uvqfC qGaTtm0RYdsfKw/q3D0PAaQaO7ZymHLUmLmtrGynuJv0pk3gSHCyuXMuP2CWX1fiTdHK EtWwcDZUwA97OVv86V3BV1w4W5L+yoPwOiyVWjOR9Ap6a0adZrpw4+od+kxcvJToG0+J zmKlK0OA3/Kreuk5Cd3rcH6L6k9FTjOZiS4KHTS6svErwpd22OQs48lkYYB4KMkiTibK xZiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=wfgQeK43; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id w7-20020a654107000000b005898e10f9b9si9252774pgp.213.2023.11.21.00.43.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 00:43:38 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=wfgQeK43; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id D64B88036912; Tue, 21 Nov 2023 00:43:30 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229888AbjKUInV (ORCPT + 99 others); Tue, 21 Nov 2023 03:43:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229437AbjKUInU (ORCPT ); Tue, 21 Nov 2023 03:43:20 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3AF6EAC; Tue, 21 Nov 2023 00:43:16 -0800 (PST) Date: Tue, 21 Nov 2023 08:43:13 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1700556193; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tQQaceoHAxtmKdnMRuCtP57MdrImWR4O7cyjfd4snZo=; b=wfgQeK43WNeZirdINalDW87tmwdMhudNQJGoHT8Rf185mLFGanYCDU456oBr5rkC/dV5hE 9IKXqIaRWuaIzFXgXy2cln+IF9VGcfR0qy+utEnu5nLbR6uNq5pb7rqjdDln/ZIhYo8yFF xhz+lcakyROU/TUFppm1kDJI/c6bCWT7H389BS0MEM8c95rPhvWSlvSn8a6DYGYrlFM7yR gU9ebd4zEWhEQyTl0CkwMMUefqnMX531bPA1ymW7vjM46i876tESwZmJeFd0YSwZ52QFDx OB7Y82vDmu6KqG3wQtqIh12NGFI6DXGxYM3Vd84ad/uxJbhRm40XQnFZ3PHFlQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1700556193; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tQQaceoHAxtmKdnMRuCtP57MdrImWR4O7cyjfd4snZo=; b=YMKB5GR+f3Zcy1acmp3N4j/uo2az+5X6dSqqCynuA71Cls5cPHe0rkNW0M0mqcNjBV3vAp W5u/LhCSYMrHNzBg== From: "tip-bot2 for Andrew Cooper" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/apic] x86/apic: Drop enum apic_delivery_modes Cc: Andrew Cooper , Thomas Gleixner , Steve Wahl , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20231102-x86-apic-v1-2-bf049a2a0ed6@citrix.com> References: <20231102-x86-apic-v1-2-bf049a2a0ed6@citrix.com> MIME-Version: 1.0 Message-ID: <170055619305.398.15160547341395358366.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.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 (agentk.vger.email [0.0.0.0]); Tue, 21 Nov 2023 00:43:31 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781455253176623968 X-GMAIL-MSGID: 1783162437037525263 The following commit has been merged into the x86/apic branch of tip: Commit-ID: 7c9158231f42e574f8290e15ea56d108ca49e583 Gitweb: https://git.kernel.org/tip/7c9158231f42e574f8290e15ea56d108ca49e583 Author: Andrew Cooper AuthorDate: Thu, 02 Nov 2023 12:26:20 Committer: Thomas Gleixner CommitterDate: Tue, 21 Nov 2023 09:37:30 +01:00 x86/apic: Drop enum apic_delivery_modes The type is not used any more. Replace the constants with plain defines so they can live outside of an __ASSEMBLY__ block, allowing for more cleanup in subsequent changes. Signed-off-by: Andrew Cooper Signed-off-by: Thomas Gleixner Reviewed-by: Steve Wahl Link: https://lore.kernel.org/r/20231102-x86-apic-v1-2-bf049a2a0ed6@citrix.com --- arch/x86/include/asm/apicdef.h | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/arch/x86/include/asm/apicdef.h b/arch/x86/include/asm/apicdef.h index 4b125e5..ddcbf00 100644 --- a/arch/x86/include/asm/apicdef.h +++ b/arch/x86/include/asm/apicdef.h @@ -20,6 +20,13 @@ */ #define IO_APIC_SLOT_SIZE 1024 +#define APIC_DELIVERY_MODE_FIXED 0 +#define APIC_DELIVERY_MODE_LOWESTPRIO 1 +#define APIC_DELIVERY_MODE_SMI 2 +#define APIC_DELIVERY_MODE_NMI 4 +#define APIC_DELIVERY_MODE_INIT 5 +#define APIC_DELIVERY_MODE_EXTINT 7 + #define APIC_ID 0x20 #define APIC_LVR 0x30 @@ -430,14 +437,5 @@ struct local_apic { #define BAD_APICID 0xFFFFu #endif -enum apic_delivery_modes { - APIC_DELIVERY_MODE_FIXED = 0, - APIC_DELIVERY_MODE_LOWESTPRIO = 1, - APIC_DELIVERY_MODE_SMI = 2, - APIC_DELIVERY_MODE_NMI = 4, - APIC_DELIVERY_MODE_INIT = 5, - APIC_DELIVERY_MODE_EXTINT = 7, -}; - #endif /* !__ASSEMBLY__ */ #endif /* _ASM_X86_APICDEF_H */