Module Name: src
Committed By: martin
Date: Sat Apr 25 10:54:23 UTC 2020
Modified Files:
src/sys/arch/hppa/hppa [netbsd-8]: trap.c
Log Message:
Pull up following revision(s) (requested by skrll in ticket #1542):
sys/arch/hppa/hppa/trap.c: revision 1.115
Fix KASSERT that has been incorrect since revision 1.85 from 10 years
ago.
To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.107.10.1 src/sys/arch/hppa/hppa/trap.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/hppa/hppa/trap.c
diff -u src/sys/arch/hppa/hppa/trap.c:1.107 src/sys/arch/hppa/hppa/trap.c:1.107.10.1
--- src/sys/arch/hppa/hppa/trap.c:1.107 Mon Mar 2 11:05:12 2015
+++ src/sys/arch/hppa/hppa/trap.c Sat Apr 25 10:54:23 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.107 2015/03/02 11:05:12 martin Exp $ */
+/* $NetBSD: trap.c,v 1.107.10.1 2020/04/25 10:54:23 martin Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.107 2015/03/02 11:05:12 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.107.10.1 2020/04/25 10:54:23 martin Exp $");
/* #define INTRDEBUG */
/* #define TRAPDEBUG */
@@ -850,7 +850,7 @@ do_onfault:
}
/* Never call uvm_fault in interrupt context. */
- KASSERT(curcpu()->ci_cpl == 0);
+ KASSERT(curcpu()->ci_intr_depth == 0);
onfault = pcb->pcb_onfault;
pcb->pcb_onfault = 0;
