From: "tip-bot2 for Andrew Cooper" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Andrew Cooper <andrew.cooper3@citrix.com>,
Thomas Gleixner <tglx@linutronix.de>,
Steve Wahl <steve.wahl@hpe.com>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/apic] x86/apic: Drop enum apic_delivery_modes
Date: Tue, 21 Nov 2023 08:43:13 -0000 [thread overview]
Message-ID: <170055619305.398.15160547341395358366.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20231102-x86-apic-v1-2-bf049a2a0ed6@citrix.com>
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 <andrew.cooper3@citrix.com>
AuthorDate: Thu, 02 Nov 2023 12:26:20
Committer: Thomas Gleixner <tglx@linutronix.de>
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 <andrew.cooper3@citrix.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Steve Wahl <steve.wahl@hpe.com>
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 */
next prev parent reply other threads:[~2023-11-21 8:43 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-02 12:26 [PATCH 0/3] x86/apic: Misc pruning Andrew Cooper
2023-11-02 12:26 ` [PATCH 1/3] x86/apic: Drop apic::delivery_mode Andrew Cooper
2023-11-03 20:15 ` Steve Wahl
2023-11-04 19:13 ` Thomas Gleixner
2023-11-21 8:43 ` [tip: x86/apic] " tip-bot2 for Andrew Cooper
2023-11-21 12:04 ` Borislav Petkov
2023-11-21 12:18 ` x86/apic: Further apic::delivery_mode cleanup Andrew Cooper
2023-11-21 12:30 ` [PATCH RESEND] " Andrew Cooper
2023-11-21 18:04 ` [tip: x86/apic] x86/apic: Drop apic::delivery_mode tip-bot2 for Andrew Cooper
2023-11-02 12:26 ` [PATCH 2/3] x86/apic: Drop enum apic_delivery_modes Andrew Cooper
2023-11-03 20:15 ` Steve Wahl
2023-11-21 8:43 ` tip-bot2 for Andrew Cooper [this message]
2023-11-21 18:04 ` [tip: x86/apic] " tip-bot2 for Andrew Cooper
2023-11-02 12:26 ` [PATCH 3/3] x86/apic: Drop struct local_apic Andrew Cooper
2023-11-03 20:16 ` Steve Wahl
2023-11-14 11:32 ` Ilpo Järvinen
2023-11-21 8:43 ` [tip: x86/apic] " tip-bot2 for Andrew Cooper
2023-11-21 18:04 ` tip-bot2 for Andrew Cooper
2023-11-03 19:58 ` Notes on BAD_APICID, Was: [PATCH 0/3] x86/apic: Misc pruning Andrew Cooper
2023-11-04 19:15 ` Thomas Gleixner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=170055619305.398.15160547341395358366.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=andrew.cooper3@citrix.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=steve.wahl@hpe.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®