Module Name: src
Committed By: riastradh
Date: Sun Aug 7 23:42:09 UTC 2022
Modified Files:
src/external/cddl/osnet/dev/sdt: sdt.c
src/external/cddl/osnet/sys/kern: opensolaris.c
src/share/mk: bsd.kmodule.mk
Log Message:
bsd.kmodule.mk: Build modules with KDTRACE_HOOKS if MKDTRACE=yes.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/external/cddl/osnet/dev/sdt/sdt.c
cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/sys/kern/opensolaris.c
cvs rdiff -u -r1.80 -r1.81 src/share/mk/bsd.kmodule.mk
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/sdt/sdt.c
diff -u src/external/cddl/osnet/dev/sdt/sdt.c:1.22 src/external/cddl/osnet/dev/sdt/sdt.c:1.23
--- src/external/cddl/osnet/dev/sdt/sdt.c:1.22 Sun Aug 7 20:47:05 2022
+++ src/external/cddl/osnet/dev/sdt/sdt.c Sun Aug 7 23:42:09 2022
@@ -39,7 +39,7 @@
* unloaded; in particular, probes may not span multiple kernel modules.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdt.c,v 1.22 2022/08/07 20:47:05 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdt.c,v 1.23 2022/08/07 23:42:09 riastradh Exp $");
#include <sys/cdefs.h>
#include <sys/proc.h>
@@ -68,7 +68,6 @@ __KERNEL_RCSID(0, "$NetBSD: sdt.c,v 1.22
#include <sys/module.h>
#include <sys/mutex.h>
#include <sys/queue.h>
-#define KDTRACE_HOOKS
#include <sys/sdt.h>
#include <sys/dtrace.h>
Index: src/external/cddl/osnet/sys/kern/opensolaris.c
diff -u src/external/cddl/osnet/sys/kern/opensolaris.c:1.3 src/external/cddl/osnet/sys/kern/opensolaris.c:1.4
--- src/external/cddl/osnet/sys/kern/opensolaris.c:1.3 Sun Jul 25 06:07:42 2021
+++ src/external/cddl/osnet/sys/kern/opensolaris.c Sun Aug 7 23:42:09 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: opensolaris.c,v 1.3 2021/07/25 06:07:42 skrll Exp $ */
+/* $NetBSD: opensolaris.c,v 1.4 2022/08/07 23:42:09 riastradh Exp $ */
/*-
* Copyright 2007 John Birrell <j...@freebsd.org>
*
@@ -38,6 +38,7 @@
#include <sys/misc.h>
#include <sys/module.h>
#include <sys/mutex.h>
+#include <sys/sdt.h>
cpu_core_t cpu_core[MAXCPUS];
solaris_cpu_t solaris_cpu[MAXCPUS];
@@ -66,3 +67,5 @@ void
opensolaris_fini(void *dummy)
{
}
+
+SDT_PROBE_DEFINE1(sdt, , , set__error, "int");
Index: src/share/mk/bsd.kmodule.mk
diff -u src/share/mk/bsd.kmodule.mk:1.80 src/share/mk/bsd.kmodule.mk:1.81
--- src/share/mk/bsd.kmodule.mk:1.80 Wed Aug 3 09:37:36 2022
+++ src/share/mk/bsd.kmodule.mk Sun Aug 7 23:42:09 2022
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.kmodule.mk,v 1.80 2022/08/03 09:37:36 riastradh Exp $
+# $NetBSD: bsd.kmodule.mk,v 1.81 2022/08/07 23:42:09 riastradh Exp $
# We are not building this with PIE
MKPIE=no
@@ -30,6 +30,7 @@ CFLAGS+= -ffreestanding ${COPTS}
CPPFLAGS+= -nostdinc -I. -I${.CURDIR} -isystem $S -isystem $S/arch
CPPFLAGS+= -isystem ${S}/../common/include
CPPFLAGS+= -D_KERNEL -D_MODULE -DSYSCTL_INCLUDE_DESCR
+CPPFLAGS+= ${${MKDTRACE:Uno} != "no" :? -DKDTRACE_HOOKS :}
CWARNFLAGS.clang+= -Wno-error=constant-conversion
