Module Name: src
Committed By: ozaki-r
Date: Thu Feb 26 10:31:52 UTC 2015
Modified Files:
src/external/cddl/osnet/dev/fbt: fbt.c
src/external/cddl/osnet/dev/sdt: sdt.c
Log Message:
Fix inconsistency between module and internal names of sdt and fbt
PR 49697
OK wiz@
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/external/cddl/osnet/dev/fbt/fbt.c
cvs rdiff -u -r1.10 -r1.11 src/external/cddl/osnet/dev/sdt/sdt.c
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.17 src/external/cddl/osnet/dev/fbt/fbt.c:1.18
--- src/external/cddl/osnet/dev/fbt/fbt.c:1.17 Thu Feb 26 09:10:52 2015
+++ src/external/cddl/osnet/dev/fbt/fbt.c Thu Feb 26 10:31:52 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: fbt.c,v 1.17 2015/02/26 09:10:52 ozaki-r Exp $ */
+/* $NetBSD: fbt.c,v 1.18 2015/02/26 10:31:52 ozaki-r Exp $ */
/*
* CDDL HEADER START
@@ -2104,7 +2104,7 @@ fbt_unload(void)
static int
-fbt_modcmd(modcmd_t cmd, void *data)
+dtrace_fbt_modcmd(modcmd_t cmd, void *data)
{
int bmajor = -1, cmajor = -1;
int error;
@@ -2132,4 +2132,4 @@ fbt_open(dev_t dev, int flags, int mode,
return (0);
}
-MODULE(MODULE_CLASS_MISC, fbt, "dtrace");
+MODULE(MODULE_CLASS_MISC, dtrace_fbt, "dtrace");
Index: src/external/cddl/osnet/dev/sdt/sdt.c
diff -u src/external/cddl/osnet/dev/sdt/sdt.c:1.10 src/external/cddl/osnet/dev/sdt/sdt.c:1.11
--- src/external/cddl/osnet/dev/sdt/sdt.c:1.10 Thu Feb 26 09:10:53 2015
+++ src/external/cddl/osnet/dev/sdt/sdt.c Thu Feb 26 10:31:52 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sdt.c,v 1.10 2015/02/26 09:10:53 ozaki-r Exp $ */
+/* $NetBSD: sdt.c,v 1.11 2015/02/26 10:31:52 ozaki-r Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -450,7 +450,7 @@ sdt_unload(void)
}
static int
-sdt_modcmd(modcmd_t cmd, void *data)
+dtrace_sdt_modcmd(modcmd_t cmd, void *data)
{
int bmajor = -1, cmajor = -1;
int error;
@@ -478,4 +478,4 @@ sdt_open(dev_t dev, int flags, int mode,
return (0);
}
-MODULE(MODULE_CLASS_MISC, sdt, "dtrace");
+MODULE(MODULE_CLASS_MISC, dtrace_sdt, "dtrace");
