Module Name: src
Committed By: riastradh
Date: Thu Nov 15 04:55:17 UTC 2018
Modified Files:
src/external/cddl/osnet/dist/uts/common/sys: dtrace.h
Log Message:
Omit conflicting definition that breaks build on aarch64.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 \
src/external/cddl/osnet/dist/uts/common/sys/dtrace.h
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/dist/uts/common/sys/dtrace.h
diff -u src/external/cddl/osnet/dist/uts/common/sys/dtrace.h:1.17 src/external/cddl/osnet/dist/uts/common/sys/dtrace.h:1.18
--- src/external/cddl/osnet/dist/uts/common/sys/dtrace.h:1.17 Mon Jun 4 21:36:03 2018
+++ src/external/cddl/osnet/dist/uts/common/sys/dtrace.h Thu Nov 15 04:55:17 2018
@@ -2483,7 +2483,10 @@ extern void dtrace_helpers_destroy(proc_
#define ARG2_MASK 0x1f
#define OFFSET_SHIFT 15
#define OFFSET_SIZE 7
+#if 0
+/* conflicts with lzjb.c */
#define OFFSET_MASK ((1 << OFFSET_SIZE) - 1)
+#endif
#define DTRACE_INVOP_PUSHM 1
#define DTRACE_INVOP_RET 2
