Module Name: src
Committed By: rin
Date: Wed Feb 13 08:46:40 UTC 2019
Modified Files:
src/external/cddl/osnet/dev/dtrace/i386: dtrace_subr.c
Log Message:
Fix DIAGNOSTIC build; replace FreeBSD-specific function with ours.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/external/cddl/osnet/dev/dtrace/i386/dtrace_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dev/dtrace/i386/dtrace_subr.c
diff -u src/external/cddl/osnet/dev/dtrace/i386/dtrace_subr.c:1.11 src/external/cddl/osnet/dev/dtrace/i386/dtrace_subr.c:1.12
--- src/external/cddl/osnet/dev/dtrace/i386/dtrace_subr.c:1.11 Mon Jun 4 21:35:29 2018
+++ src/external/cddl/osnet/dev/dtrace/i386/dtrace_subr.c Wed Feb 13 08:46:40 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dtrace_subr.c,v 1.11 2018/06/04 21:35:29 christos Exp $ */
+/* $NetBSD: dtrace_subr.c,v 1.12 2019/02/13 08:46:40 rin Exp $ */
/*
* CDDL HEADER START
@@ -424,7 +424,8 @@ dtrace_trap(struct trapframe *frame, u_i
*/
nofault = (cpu_core[cpuid].cpuc_dtrace_flags & CPU_DTRACE_NOFAULT) != 0;
if (nofault) {
- KASSERTMSG((read_eflags() & PSL_I) == 0, "interrupts enabled");
+ KASSERTMSG((x86_read_flags() & PSL_I) == 0,
+ "interrupts enabled");
/*
* There are only a couple of trap types that are expected.
