]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
x86/nmi: Remove an unnecessary IS_ENABLED(CONFIG_SMP)
authorXin Li (Intel) <xin@zytor.com>
Thu, 1 Feb 2024 09:46:04 +0000 (01:46 -0800)
committerThomas Gleixner <tglx@linutronix.de>
Tue, 27 Feb 2024 21:00:50 +0000 (22:00 +0100)
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

index 17e955ab69feda933cca3708822f6f9f598e31bf..44fe569e643c33920267b32bc5d2176ad0757750 100644 (file)
@@ -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;