Index: sys/kern/uipc_mbuf.c
===================================================================
--- sys/kern/uipc_mbuf.c
+++ sys/kern/uipc_mbuf.c
@@ -49,48 +49,46 @@
 #include <sys/uio.h>
 #include <sys/sdt.h>
 
-SDT_PROVIDER_DEFINE(mbuf);
-
-SDT_PROBE_DEFINE5_XLATE(mbuf, , , m__init,
+SDT_PROBE_DEFINE5_XLATE(sdt, mbuf, , m__init,
     "struct mbuf *", "mbufinfo_t *",
     "uint32_t", "uint32_t",
     "uint16_t", "uint16_t",
     "uint32_t", "uint32_t",
     "uint32_t", "uint32_t");
 
-SDT_PROBE_DEFINE3_XLATE(mbuf, , , m__gethdr,
+SDT_PROBE_DEFINE3_XLATE(sdt, mbuf, , m__gethdr,
     "uint32_t", "uint32_t",
     "uint16_t", "uint16_t",
     "struct mbuf *", "mbufinfo_t *");
 
-SDT_PROBE_DEFINE3_XLATE(mbuf, , , m__get,
+SDT_PROBE_DEFINE3_XLATE(sdt, mbuf, , m__get,
     "uint32_t", "uint32_t",
     "uint16_t", "uint16_t",
     "struct mbuf *", "mbufinfo_t *");
 
-SDT_PROBE_DEFINE4_XLATE(mbuf, , , m__getcl,
+SDT_PROBE_DEFINE4_XLATE(sdt, mbuf, , m__getcl,
     "uint32_t", "uint32_t",
     "uint16_t", "uint16_t",
     "uint32_t", "uint32_t",
     "struct mbuf *", "mbufinfo_t *");
 
-SDT_PROBE_DEFINE3_XLATE(mbuf, , , m__clget,
+SDT_PROBE_DEFINE3_XLATE(sdt, mbuf, , m__clget,
     "struct mbuf *", "mbufinfo_t *",
     "uint32_t", "uint32_t",
     "uint32_t", "uint32_t");
 
-SDT_PROBE_DEFINE4_XLATE(mbuf, , , m__cljget,
+SDT_PROBE_DEFINE4_XLATE(sdt, mbuf, , m__cljget,
     "struct mbuf *", "mbufinfo_t *",
     "uint32_t", "uint32_t",
     "uint32_t", "uint32_t",
     "void*", "void*");
 
-SDT_PROBE_DEFINE(mbuf, , , m__cljset);
+SDT_PROBE_DEFINE(sdt, mbuf, , m__cljset);
 
-SDT_PROBE_DEFINE1_XLATE(mbuf, , , m__free,
+SDT_PROBE_DEFINE1_XLATE(sdt, mbuf, , m__free,
         "struct mbuf *", "mbufinfo_t *");
 
-SDT_PROBE_DEFINE1_XLATE(mbuf, , , m__freem,
+SDT_PROBE_DEFINE1_XLATE(sdt, mbuf, , m__freem,
     "struct mbuf *", "mbufinfo_t *");
 
 #include <security/mac/mac_framework.h>
Index: sys/sys/mbuf.h
===================================================================
--- sys/sys/mbuf.h
+++ sys/sys/mbuf.h
@@ -48,27 +48,25 @@
 #include <sys/sdt.h>
 
 #define	MBUF_PROBE1(probe, arg0)					\
-	SDT_PROBE1(mbuf, , , probe, arg0)
+	SDT_PROBE1(sdt, mbuf, , probe, arg0)
 #define	MBUF_PROBE2(probe, arg0, arg1)					\
-	SDT_PROBE2(mbuf, , , probe, arg0, arg1)
+	SDT_PROBE2(sdt, mbuf, , probe, arg0, arg1)
 #define	MBUF_PROBE3(probe, arg0, arg1, arg2)			\
-	SDT_PROBE3(mbuf, , , probe, arg0, arg1, arg2)
+	SDT_PROBE3(sdt, mbuf, , probe, arg0, arg1, arg2)
 #define	MBUF_PROBE4(probe, arg0, arg1, arg2, arg3)				\
-	SDT_PROBE4(mbuf, , , probe, arg0, arg1, arg2, arg3)
+	SDT_PROBE4(sdt, mbuf, , probe, arg0, arg1, arg2, arg3)
 #define	MBUF_PROBE5(probe, arg0, arg1, arg2, arg3, arg4)			\
-	SDT_PROBE5(mbuf, , , probe, arg0, arg1, arg2, arg3, arg4)
+	SDT_PROBE5(sdt, mbuf, , probe, arg0, arg1, arg2, arg3, arg4)
 
-SDT_PROVIDER_DECLARE(mbuf);
-
-SDT_PROBE_DECLARE(mbuf, , , m__init);
-SDT_PROBE_DECLARE(mbuf, , , m__gethdr);
-SDT_PROBE_DECLARE(mbuf, , , m__get);
-SDT_PROBE_DECLARE(mbuf, , , m__getcl);
-SDT_PROBE_DECLARE(mbuf, , , m__clget);
-SDT_PROBE_DECLARE(mbuf, , , m__cljget);
-SDT_PROBE_DECLARE(mbuf, , , m__cljset);
-SDT_PROBE_DECLARE(mbuf, , , m__free);
-SDT_PROBE_DECLARE(mbuf, , , m__freem);
+SDT_PROBE_DECLARE(sdt, mbuf, , m__init);
+SDT_PROBE_DECLARE(sdt, mbuf, , m__gethdr);
+SDT_PROBE_DECLARE(sdt, mbuf, , m__get);
+SDT_PROBE_DECLARE(sdt, mbuf, , m__getcl);
+SDT_PROBE_DECLARE(sdt, mbuf, , m__clget);
+SDT_PROBE_DECLARE(sdt, mbuf, , m__cljget);
+SDT_PROBE_DECLARE(sdt, mbuf, , m__cljset);
+SDT_PROBE_DECLARE(sdt, mbuf, , m__free);
+SDT_PROBE_DECLARE(sdt, mbuf, , m__freem);
 
 #endif /* _KERNEL */