diff options
| author |   Don Zickus <dzickus@redhat.com> | 2006-09-26 10:52:26 +0200 |
|---|---|---|
| committer |   Andi Kleen <andi@basil.nowhere.org> | 2006-09-26 10:52:26 +0200 |
| commit | b7471c6da94d30d3deadc55986cc38d1ff57f9ca (patch) | |
| tree | 6aa23314273763acccbe9ddd0b8bd442edde0509 /arch/i386/kernel/apic.c | |
| parent | [PATCH] Add SMP support on x86_64 to reservation framework (diff) | |
| download | linux-dev-b7471c6da94d30d3deadc55986cc38d1ff57f9ca.tar.xz linux-dev-b7471c6da94d30d3deadc55986cc38d1ff57f9ca.zip | |
[PATCH] i386: Add SMP support on i386 to reservation framework
This patch includes the changes to make the nmi watchdog on i386 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/i386/kernel/apic.c')
| -rw-r--r-- | arch/i386/kernel/apic.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/i386/kernel/apic.c b/arch/i386/kernel/apic.c index 8c844d07862f..1a34fc57800b 100644 --- a/arch/i386/kernel/apic.c +++ b/arch/i386/kernel/apic.c @@ -586,8 +586,7 @@ void __devinit setup_local_APIC(void) printk("No ESR for 82489DX.\n"); } - if (nmi_watchdog == NMI_LOCAL_APIC) - setup_apic_nmi_watchdog(); + setup_apic_nmi_watchdog(NULL); apic_pm_activate(); } |