aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386/kernel/traps.c
diff options
context:
space:
mode:
authorDon Zickus <dzickus@redhat.com>2006-09-26 10:52:26 +0200
committerAndi Kleen <andi@basil.nowhere.org>2006-09-26 10:52:26 +0200
commitb7471c6da94d30d3deadc55986cc38d1ff57f9ca (patch)
tree6aa23314273763acccbe9ddd0b8bd442edde0509 /arch/i386/kernel/traps.c
parent[PATCH] Add SMP support on x86_64 to reservation framework (diff)
downloadlinux-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/traps.c')
-rw-r--r--arch/i386/kernel/traps.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c
index 7e9edafffd8a..3a07b2677e2a 100644
--- a/arch/i386/kernel/traps.c
+++ b/arch/i386/kernel/traps.c
@@ -724,7 +724,7 @@ static void default_do_nmi(struct pt_regs * regs)
* so it must be the NMI watchdog.
*/
if (nmi_watchdog) {
- nmi_watchdog_tick(regs);
+ nmi_watchdog_tick(regs, reason);
return;
}
#endif