Module Name: src
Committed By: riz
Date: Sat Nov 7 01:50:44 UTC 2015
Modified Files:
src/external/cddl/osnet/dev/dtrace [netbsd-7]: dtrace_ioctl.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1003):
external/cddl/osnet/dev/dtrace/dtrace_ioctl.c: revision 1.5
Fix dtrace module autoload.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.8.1 \
src/external/cddl/osnet/dev/dtrace/dtrace_ioctl.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/dtrace/dtrace_ioctl.c
diff -u src/external/cddl/osnet/dev/dtrace/dtrace_ioctl.c:1.4 src/external/cddl/osnet/dev/dtrace/dtrace_ioctl.c:1.4.8.1
--- src/external/cddl/osnet/dev/dtrace/dtrace_ioctl.c:1.4 Sun Mar 3 18:16:35 2013
+++ src/external/cddl/osnet/dev/dtrace/dtrace_ioctl.c Sat Nov 7 01:50:44 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: dtrace_ioctl.c,v 1.4 2013/03/03 18:16:35 christos Exp $ */
+/* $NetBSD: dtrace_ioctl.c,v 1.4.8.1 2015/11/07 01:50:44 riz Exp $ */
/*
* CDDL HEADER START
@@ -659,10 +659,15 @@ again:
mutex_exit(&dtrace_provider_lock);
if (pvp == NULL && error == 0) {
- error = module_autoload(pvd->dtvd_name,
- MODULE_CLASS_MISC);
- if (error == 0)
- goto again;
+ char name[NAME_MAX];
+
+ if (snprintf(name, sizeof name, "dtrace_%s",
+ pvd->dtvd_name) < sizeof name) {
+ error = module_autoload(name,
+ MODULE_CLASS_MISC);
+ if (error == 0)
+ goto again;
+ }
}
if (pvp == NULL)
