Messages in this thread Patch in this message | | | Date | Tue, 27 Feb 2024 21:10:38 -0000 | From | "tip-bot2 for Xin Li (Intel)" <> | Subject | [tip: x86/cleanups] x86/nmi: Remove an unnecessary IS_ENABLED(CONFIG_SMP) |
| |
The following commit has been merged into the x86/cleanups branch of tip:
Commit-ID: 47403a4b49767f1d533e4dc5f5cf5cc957f22a5e Gitweb: https://git.kernel.org/tip/47403a4b49767f1d533e4dc5f5cf5cc957f22a5e Author: Xin Li (Intel) <xin@zytor.com> AuthorDate: Thu, 01 Feb 2024 01:46:04 -08:00 Committer: Thomas Gleixner <tglx@linutronix.de> CommitterDate: Tue, 27 Feb 2024 22:00:50 +01:00
x86/nmi: Remove an unnecessary IS_ENABLED(CONFIG_SMP)
IS_ENABLED(CONFIG_SMP) is unnecessary here: smp_processor_id() should always return zero on UP, and arch_cpu_is_offline() reduces to !(cpu == 0), so this is a statically false condition on UP.
Suggested-by: H. Peter Anvin (Intel) <hpa@zytor.com> Signed-off-by: Xin Li (Intel) <xin@zytor.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Link: https://lore.kernel.org/r/20240201094604.3918141-1-xin@zytor.com
--- arch/x86/kernel/nmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c index 17e955a..44fe569 100644 --- a/arch/x86/kernel/nmi.c +++ b/arch/x86/kernel/nmi.c @@ -502,7 +502,7 @@ DEFINE_IDTENTRY_RAW(exc_nmi) if (IS_ENABLED(CONFIG_NMI_CHECK_CPU)) raw_atomic_long_inc(&nsp->idt_calls); - if (IS_ENABLED(CONFIG_SMP) && arch_cpu_is_offline(smp_processor_id())) { + if (arch_cpu_is_offline(smp_processor_id())) { if (microcode_nmi_handler_enabled()) microcode_offline_nmi_handler(); return;
| |