Module Name: src Committed By: riastradh Date: Fri Jun 19 02:33:00 UTC 2015
Modified Files: src/external/cddl/osnet/dev/dtrace: dtrace_ioctl.c Log Message: Fix dtrace module autoload. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 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.5 --- 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 Fri Jun 19 02:33:00 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.5 2015/06/19 02:33:00 riastradh 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)