From 3ad982d540f0f29f916ab0ce3dc4c93d3c95fb89 Mon Sep 17 00:00:00 2001
From: Taylor R Campbell <riastradh@NetBSD.org>
Date: Sun, 7 Aug 2022 11:02:03 +0000
Subject: [PATCH] bsd.kmodule.mk: Build modules with KDTRACE_HOOKS if
 MKDTRACE=yes.

---
 external/cddl/osnet/dev/sdt/sdt.c | 1 -
 share/mk/bsd.kmodule.mk           | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/external/cddl/osnet/dev/sdt/sdt.c b/external/cddl/osnet/dev/sdt/sdt.c
index 23e27e95a549..b18ba093f3cd 100644
--- a/external/cddl/osnet/dev/sdt/sdt.c
+++ b/external/cddl/osnet/dev/sdt/sdt.c
@@ -65,7 +65,6 @@ __KERNEL_RCSID(0, "$NetBSD: sdt.c,v 1.21 2022/03/28 12:33:20 riastradh Exp $");
 #include <sys/module.h>
 #include <sys/mutex.h>
 #include <sys/queue.h>
-#define KDTRACE_HOOKS
 #include <sys/sdt.h>
 
 #include <sys/dtrace.h>
diff --git a/share/mk/bsd.kmodule.mk b/share/mk/bsd.kmodule.mk
index 8c3980b5cc59..15851e52c586 100644
--- a/share/mk/bsd.kmodule.mk
+++ b/share/mk/bsd.kmodule.mk
@@ -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