Module Name: src
Committed By: kamil
Date: Sat Mar 9 18:53:52 UTC 2019
Modified Files:
src/external/cddl/osnet/dev/fbt: fbt.c
src/external/cddl/osnet/dev/sdt: sdt.c
src/sys/conf: majors
Log Message:
Reserve DTrace sdt and fdt major numbers
Register cmajor 252 for fbt and 253 for sdt.
Previously the major number was picked randomly and it causes conflicts
with preallocated values for different devices.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/external/cddl/osnet/dev/fbt/fbt.c
cvs rdiff -u -r1.19 -r1.20 src/external/cddl/osnet/dev/sdt/sdt.c
cvs rdiff -u -r1.83 -r1.84 src/sys/conf/majors
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/fbt/fbt.c
diff -u src/external/cddl/osnet/dev/fbt/fbt.c:1.25 src/external/cddl/osnet/dev/fbt/fbt.c:1.26
--- src/external/cddl/osnet/dev/fbt/fbt.c:1.25 Sun Jan 27 02:08:34 2019
+++ src/external/cddl/osnet/dev/fbt/fbt.c Sat Mar 9 18:53:52 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: fbt.c,v 1.25 2019/01/27 02:08:34 pgoyette Exp $ */
+/* $NetBSD: fbt.c,v 1.26 2019/03/09 18:53:52 kamil Exp $ */
/*
* CDDL HEADER START
@@ -1316,7 +1316,7 @@ fbt_unload(void)
static int
dtrace_fbt_modcmd(modcmd_t cmd, void *data)
{
- int bmajor = -1, cmajor = -1;
+ int bmajor = -1, cmajor = 352;
int error;
switch (cmd) {
Index: src/external/cddl/osnet/dev/sdt/sdt.c
diff -u src/external/cddl/osnet/dev/sdt/sdt.c:1.19 src/external/cddl/osnet/dev/sdt/sdt.c:1.20
--- src/external/cddl/osnet/dev/sdt/sdt.c:1.19 Mon May 28 21:05:03 2018
+++ src/external/cddl/osnet/dev/sdt/sdt.c Sat Mar 9 18:53:52 2019
@@ -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.19 2018/05/28 21:05:03 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdt.c,v 1.20 2019/03/09 18:53:52 kamil Exp $");
#include <sys/cdefs.h>
#include <sys/proc.h>
@@ -550,7 +550,7 @@ MODULE_DEPEND(sdt, dtrace, 1, 1, 1);
static int
dtrace_sdt_modcmd(modcmd_t cmd, void *data)
{
- int bmajor = -1, cmajor = -1;
+ int bmajor = -1, cmajor = 353;
int error;
switch (cmd) {
Index: src/sys/conf/majors
diff -u src/sys/conf/majors:1.83 src/sys/conf/majors:1.84
--- src/sys/conf/majors:1.83 Sat Feb 23 12:25:33 2019
+++ src/sys/conf/majors Sat Mar 9 18:53:52 2019
@@ -1,4 +1,4 @@
-# $NetBSD: majors,v 1.83 2019/02/23 12:25:33 kamil Exp $
+# $NetBSD: majors,v 1.84 2019/03/09 18:53:52 kamil Exp $
#
# Device majors for Machine-Independent drivers.
#
@@ -83,3 +83,5 @@ device-major kcov char 346
device-major spi char 347 spi
# Majors 348-350 are reserved for HAXM (pkgsrc/emulators/haxm)
# Major 351 is reserved for sys/modules/examples
+# Major 352 is reserved for external/cddl/osnet/dev/fbt/fbt.c
+# Major 353 is reserved for external/cddl/osnet/dev/sdt/sdt.c
