[src/netbsd-9]: src/external/cddl/osnet/dev/dtrace/amd64 Pull up following re...

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

details:   https://anonhg.NetBSD.org/src/rev/15c1b78b8bbd
branches:  netbsd-9
changeset: 843483:15c1b78b8bbd
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Nov 10 13:18:42 2019 +0000

description:
Pull up following revision(s) (requested by hannken in ticket #410):

        external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c: revision 1.14

dtrace_trap() gets called from alltraps() -> trap() with interrupts enabled
so we cannot assert for interrupts disabled here.
Should fix PR kern/54603: kernel panic when running dtruss

diffstat:

 external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c |  6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diffs (21 lines):

diff -r d9badbd91831 -r 15c1b78b8bbd external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c
--- a/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c        Sun Nov 10 13:14:41 2019 +0000
+++ b/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c        Sun Nov 10 13:18:42 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dtrace_subr.c,v 1.13 2019/07/05 08:29:18 hannken Exp $ */
+/*     $NetBSD: dtrace_subr.c,v 1.13.2.1 2019/11/10 13:18:42 martin Exp $      */
 
 /*
  * CDDL HEADER START
@@ -412,7 +412,11 @@
         */
        nofault = (cpu_core[cpuid].cpuc_dtrace_flags & CPU_DTRACE_NOFAULT) != 0;
        if (nofault) {
+#if 0
+               This assertion would always fire, we get called from
+               alltraps() -> trap() with interrupts enabled.
                KASSERTMSG((x86_read_flags() & PSL_I) == 0, "interrupts enabled");
+#endif
 
                /*
                 * There are only a couple of trap types that are expected.