[src/trunk]: src/external/cddl/osnet/dist/uts/common/sys Restore some defines...

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

details:   https://anonhg.NetBSD.org/src/rev/11d8784a93b0
branches:  trunk
changeset: 340808:11d8784a93b0
user:      riz <riz%NetBSD.org@localhost>
date:      Fri Oct 02 22:16:38 2015 +0000

description:
Restore some defines lost in last update, and don't include sys/cpuvar.h

MKDTRACE=yes now builds for arm platforms again.

diffstat:

 external/cddl/osnet/dist/uts/common/sys/dtrace.h |  13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diffs (30 lines):

diff -r fe599b275a1a -r 11d8784a93b0 external/cddl/osnet/dist/uts/common/sys/dtrace.h
--- a/external/cddl/osnet/dist/uts/common/sys/dtrace.h  Fri Oct 02 22:15:18 2015 +0000
+++ b/external/cddl/osnet/dist/uts/common/sys/dtrace.h  Fri Oct 02 22:16:38 2015 +0000
@@ -57,7 +57,6 @@
 #ifdef illumos
 #include <sys/systm.h>
 #else
-#include <sys/cpuvar.h>
 #include <sys/proc.h>
 #include <sys/param.h>
 #include <sys/linker.h>
@@ -2450,6 +2449,18 @@
 #define DTRACE_INVOP_POPM      2
 #define DTRACE_INVOP_B         3
 
+#define        DTRACE_INVOP_MOV_IP_SP          1
+#define        DTRACE_INVOP_BX_LR              2
+#define        DTRACE_INVOP_MOV_PC_LR          3
+#define        DTRACE_INVOP_LDM                4
+#define        DTRACE_INVOP_LDMIB              5
+#define        DTRACE_INVOP_LDR_IMM            6
+#define        DTRACE_INVOP_MOVW               7
+#define        DTRACE_INVOP_MOV_IMM            8
+#define        DTRACE_INVOP_CMP_IMM            9
+#define        DTRACE_INVOP_B_LABEL            10
+#define        DTRACE_INVOP_PUSH               11
+
 #elif defined(__aarch64__)
 
 #define        INSN_SIZE       4