[src/netbsd-9]: src/sys/arch/hppa/hppa Pull up following revision(s) (request...

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

details:   https://anonhg.NetBSD.org/src/rev/1d60efd63e02
branches:  netbsd-9
changeset: 931271:1d60efd63e02
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Apr 25 10:52:56 2020 +0000

description:
Pull up following revision(s) (requested by skrll in ticket #854):

        sys/arch/hppa/hppa/trap.c: revision 1.115

Fix KASSERT that has been incorrect since revision 1.85 from 10 years
ago.

diffstat:

 sys/arch/hppa/hppa/trap.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r aaafc86483bd -r 1d60efd63e02 sys/arch/hppa/hppa/trap.c
--- a/sys/arch/hppa/hppa/trap.c Sat Apr 25 10:50:47 2020 +0000
+++ b/sys/arch/hppa/hppa/trap.c Sat Apr 25 10:52:56 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap.c,v 1.111 2019/04/15 20:45:08 skrll Exp $ */
+/*     $NetBSD: trap.c,v 1.111.4.1 2020/04/25 10:52:56 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.111 2019/04/15 20:45:08 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.111.4.1 2020/04/25 10:52:56 martin Exp $");
 
 /* #define INTRDEBUG */
 /* #define TRAPDEBUG */
@@ -853,7 +853,7 @@
                }
 
                /* 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;