1 files changed, 0 insertions, 2 deletions

diff --git a/arch/x86_64/kernel/traps.c b/arch/x86_64/kernel/traps.c
index 96f62a033242..56d7ff0c894c 100644
--- a/arch/x86_64/kernel/traps.c
+++ b/arch/x86_64/kernel/traps.c
@@ -788,7 +788,6 @@ asmlinkage __kprobes void default_do_nmi(struct pt_regs *regs)
                 if (notify_die(DIE_NMI_IPI, "nmi_ipi", regs, reason, 2, SIGINT)
                                                                 == NOTIFY_STOP)
                         return;
-#ifdef CONFIG_X86_LOCAL_APIC
                 /*
                  * Ok, so this is none of the documented NMI sources,
                  * so it must be the NMI watchdog.
@@ -796,7 +795,6 @@ asmlinkage __kprobes void default_do_nmi(struct pt_regs *regs)
                 if (nmi_watchdog_tick(regs,reason))
                         return;
                 if (!do_nmi_callback(regs,cpu))
-#endif
                         unknown_nmi_error(reason, regs);
 
                 return;