From nobody Wed Dec 17 23:02:21 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 63B0AC61D90 for ; Tue, 21 Nov 2023 18:05:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231163AbjKUSFU (ORCPT ); Tue, 21 Nov 2023 13:05:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38576 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234325AbjKUSEu (ORCPT ); Tue, 21 Nov 2023 13:04:50 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E0DB7172E; Tue, 21 Nov 2023 10:04:25 -0800 (PST) Date: Tue, 21 Nov 2023 18:04:23 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1700589864; 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=A/LxqX571fefzJvxDQtYiOwLG0wY6p4kB4B/l95UJkw=; b=qZzaJbPwkZiKq+Eiqyz9naVTX8WEkcw5sWLmu0+mXZmx8YbF6zCdKxo+AxyejHSh+JvQFr u71eOpgtrlQ6mVafzSNrz7ctoxb0GP2BvEf86egPD5m9Y6V5pOnLonhRsfoRk9c8o5wbBM 2SSbipmBm66qfrgAnWnD/zZfW22TZNuA+59XbhEvUQaxRJcWj0uSgD8pT97FIXNvFwjjTR 6hk3xpuYeQyXuVN7JgvQeHN8EgauEYgIFwMTP+kheKFSDynwbvQhOjcZ6xXVSS2hJCJi/j 1O8gjHwlFn+WD+XV7hN2RA7fDBCNqtiEqIdhyltO//ciieFakd6WGweYRf9ibg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1700589864; 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=A/LxqX571fefzJvxDQtYiOwLG0wY6p4kB4B/l95UJkw=; b=IWTvOBJcOvruNwk4b4kfE5hOGf+MYW5eabLK+bDsEtFmvZdLEgvjSVHARAqxS0+XYBBCus x0tQDdRg1kayKMCA== 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 , "Borislav Petkov (AMD)" , 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: <170058986344.398.13944817922448407011.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the x86/apic branch of tip: Commit-ID: 855da7cdf974f3902397e5bf9423c7442bdfd75f Gitweb: https://git.kernel.org/tip/855da7cdf974f3902397e5bf9423c7442= bdfd75f Author: Andrew Cooper AuthorDate: Thu, 02 Nov 2023 12:26:20=20 Committer: Borislav Petkov (AMD) CommitterDate: Tue, 21 Nov 2023 17:05:06 +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 Signed-off-by: Borislav Petkov (AMD) 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 =20 +#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 =20 #define APIC_LVR 0x30 @@ -430,14 +437,5 @@ struct local_apic { #define BAD_APICID 0xFFFFu #endif =20 -enum apic_delivery_modes { - APIC_DELIVERY_MODE_FIXED =3D 0, - APIC_DELIVERY_MODE_LOWESTPRIO =3D 1, - APIC_DELIVERY_MODE_SMI =3D 2, - APIC_DELIVERY_MODE_NMI =3D 4, - APIC_DELIVERY_MODE_INIT =3D 5, - APIC_DELIVERY_MODE_EXTINT =3D 7, -}; - #endif /* !__ASSEMBLY__ */ #endif /* _ASM_X86_APICDEF_H */