Module Name: src
Committed By: yamt
Date: Sun Oct 31 04:51:19 UTC 2010
Modified Files:
src/sys/arch/i386/i386: vector.S
Log Message:
keep interrupts disabled in NMI handler.
the patch provided by IRINO yoshiaki in PR/43007.
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 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.53 src/sys/arch/i386/i386/vector.S:1.54
--- src/sys/arch/i386/i386/vector.S:1.53 Mon Feb 22 06:42:14 2010
+++ src/sys/arch/i386/i386/vector.S Sun Oct 31 04:51:19 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vector.S,v 1.53 2010/02/22 06:42:14 darran Exp $ */
+/* $NetBSD: vector.S,v 1.54 2010/10/31 04:51:19 yamt Exp $ */
/*
* Copyright 2002 (c) Wasabi Systems, Inc.
@@ -65,7 +65,7 @@
*/
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: vector.S,v 1.53 2010/02/22 06:42:14 darran Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vector.S,v 1.54 2010/10/31 04:51:19 yamt Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -896,7 +896,10 @@
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)
