aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86_64/kernel/traps.c
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2006-09-26 04:52:29 -0400
committerAndi Kleen <andi@basil.nowhere.org>2006-09-26 04:52:29 -0400
commit7f11d8a5efd625ffa41cde1d8472f85e885478ec (patch)
tree4f80219fc2153166c89c54d6555498155fa2f3b2 /arch/x86_64/kernel/traps.c
parent5ba5891d44a6acade44887a0f3195489d46c12de (diff)
[PATCH] Remove all ifdefs for local/io apic
IO-APIC or local APIC can only be disabled at runtime anyways and Kconfig has forced these options on for a long time now. The Kconfigs are kept only now for the benefit of the shared acpi boot.c code. Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'arch/x86_64/kernel/traps.c')
-rw-r--r--arch/x86_64/kernel/traps.c2
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)
788 if (notify_die(DIE_NMI_IPI, "nmi_ipi", regs, reason, 2, SIGINT) 788 if (notify_die(DIE_NMI_IPI, "nmi_ipi", regs, reason, 2, SIGINT)
789 == NOTIFY_STOP) 789 == NOTIFY_STOP)
790 return; 790 return;
791#ifdef CONFIG_X86_LOCAL_APIC
792 /* 791 /*
793 * Ok, so this is none of the documented NMI sources, 792 * Ok, so this is none of the documented NMI sources,
794 * so it must be the NMI watchdog. 793 * so it must be the NMI watchdog.
@@ -796,7 +795,6 @@ asmlinkage __kprobes void default_do_nmi(struct pt_regs *regs)
796 if (nmi_watchdog_tick(regs,reason)) 795 if (nmi_watchdog_tick(regs,reason))
797 return; 796 return;
798 if (!do_nmi_callback(regs,cpu)) 797 if (!do_nmi_callback(regs,cpu))
799#endif
800 unknown_nmi_error(reason, regs); 798 unknown_nmi_error(reason, regs);
801 799
802 return; 800 return;