Module Name: src
Committed By: sborrill
Date: Fri Nov 18 21:09:24 UTC 2011
Modified Files:
src/sys/arch/i386/i386 [netbsd-5]: vector.S
Log Message:
Pull up the following revisions(s) (requested by dholland in ticket #1687):
sys/arch/i386/i386/vector.S: revision 1.54
Keep interrupts disabled in NMI handler. Addresses PR/43007.
To generate a diff of this commit:
cvs rdiff -u -r1.42.6.3 -r1.42.6.4 src/sys/arch/i386/i386/vector.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/i386/vector.S
diff -u src/sys/arch/i386/i386/vector.S:1.42.6.3 src/sys/arch/i386/i386/vector.S:1.42.6.4
--- src/sys/arch/i386/i386/vector.S:1.42.6.3 Thu May 20 05:51:59 2010
+++ src/sys/arch/i386/i386/vector.S Fri Nov 18 21:09:24 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vector.S,v 1.42.6.3 2010/05/20 05:51:59 snj Exp $ */
+/* $NetBSD: vector.S,v 1.42.6.4 2011/11/18 21:09:24 sborrill Exp $ */
/*
* Copyright 2002 (c) Wasabi Systems, Inc.
@@ -65,7 +65,7 @@
*/
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: vector.S,v 1.42.6.3 2010/05/20 05:51:59 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vector.S,v 1.42.6.4 2011/11/18 21:09:24 sborrill Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -841,7 +841,10 @@ IDTVEC(trap00)
IDTVEC(trap01)
BPTTRAP(T_TRCTRAP)
IDTVEC(trap02)
- ZTRAP(T_NMI)
+ pushl $0
+ pushl $(T_NMI)
+ INTRENTRY
+ jmp _C_LABEL(calltrap)
IDTVEC(trap03)
BPTTRAP(T_BPTFLT)
IDTVEC(trap04)
