[src/trunk]: src/sys/arch/i386/i386 keep interrupts disabled in NMI handler.

[yamt <yamt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7c9df2c27b60
branches:  trunk
changeset: 758280:7c9df2c27b60
user:      yamt <yamt%NetBSD.org@localhost>
date:      Sun Oct 31 04:51:19 2010 +0000

description:
keep interrupts disabled in NMI handler.
the patch provided by IRINO yoshiaki in PR/43007.

diffstat:

 sys/arch/i386/i386/vector.S |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r be1dcea86ccd -r 7c9df2c27b60 sys/arch/i386/i386/vector.S
--- a/sys/arch/i386/i386/vector.S       Sat Oct 30 21:16:07 2010 +0000
+++ b/sys/arch/i386/i386/vector.S       Sun Oct 31 04:51:19 2010 +0000
@@ -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)