Module Name: src
Committed By: tsutsui
Date: Sat Nov 26 04:31:19 UTC 2011
Modified Files:
src/sys/arch/luna68k/luna68k: machdep.c
Log Message:
Clear innmihand flag (for recursion check) when the NMI hander is returned
so that we can abort kernel multiple times even after continue.
To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/sys/arch/luna68k/luna68k/machdep.c
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/luna68k/luna68k/machdep.c
diff -u src/sys/arch/luna68k/luna68k/machdep.c:1.86 src/sys/arch/luna68k/luna68k/machdep.c:1.87
--- src/sys/arch/luna68k/luna68k/machdep.c:1.86 Tue Nov 15 13:25:44 2011
+++ src/sys/arch/luna68k/luna68k/machdep.c Sat Nov 26 04:31:19 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.86 2011/11/15 13:25:44 tsutsui Exp $ */
+/* $NetBSD: machdep.c,v 1.87 2011/11/26 04:31:19 tsutsui Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.86 2011/11/15 13:25:44 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.87 2011/11/26 04:31:19 tsutsui Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -731,6 +731,8 @@ nmihand(struct frame frame)
innmihand = 1;
luna68k_abort("ABORT SWITCH");
+
+ innmihand = 0;
}
/*
