aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86_64/kernel/apic.c
diff options
context:
space:
mode:
authorDon Zickus <dzickus@redhat.com>2006-09-26 04:52:26 -0400
committerAndi Kleen <andi@basil.nowhere.org>2006-09-26 04:52:26 -0400
commitf2802e7f571c05f9a901b1f5bd144aa730ccc88e (patch)
tree68a2c4dd80dbf2e01f048b46460517b15cda63c0 /arch/x86_64/kernel/apic.c
parentcb9c448c661d40ce2efbce8e9c19cc4d420d8ccc (diff)
[PATCH] Add SMP support on x86_64 to reservation framework
This patch includes the changes to make the nmi watchdog on x86_64 SMP aware. A bunch of code was moved around to make it simpler to read. In addition, it is now possible to determine if a particular NMI was the result of the watchdog or not. This feature allows the kernel to filter out unknown NMIs easier. Signed-off-by: Don Zickus <dzickus@redhat.com> Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'arch/x86_64/kernel/apic.c')
-rw-r--r--arch/x86_64/kernel/apic.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86_64/kernel/apic.c b/arch/x86_64/kernel/apic.c
index 2b8cef037a65..692e9b579743 100644
--- a/arch/x86_64/kernel/apic.c
+++ b/arch/x86_64/kernel/apic.c
@@ -479,8 +479,7 @@ void __cpuinit setup_local_APIC (void)
479 } 479 }
480 480
481 nmi_watchdog_default(); 481 nmi_watchdog_default();
482 if (nmi_watchdog == NMI_LOCAL_APIC) 482 setup_apic_nmi_watchdog(NULL);
483 setup_apic_nmi_watchdog();
484 apic_pm_activate(); 483 apic_pm_activate();
485} 484}
486 485