[src/netbsd-7]: src/external/cddl/osnet/dev/dtrace Pull up following revision...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e689f0e9f324
branches:  netbsd-7
changeset: 799667:e689f0e9f324
user:      riz <riz%NetBSD.org@localhost>
date:      Sat Nov 07 01:50:44 2015 +0000

description:
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.

diffstat:

 external/cddl/osnet/dev/dtrace/dtrace_ioctl.c |  15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diffs (29 lines):

diff -r 394048af0bf4 -r e689f0e9f324 external/cddl/osnet/dev/dtrace/dtrace_ioctl.c
--- a/external/cddl/osnet/dev/dtrace/dtrace_ioctl.c     Fri Nov 06 23:04:30 2015 +0000
+++ b/external/cddl/osnet/dev/dtrace/dtrace_ioctl.c     Sat Nov 07 01:50:44 2015 +0000
@@ -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 @@
                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)