9059 Simplify SMAP relocations with krtld
Portions contributed by: John Levon <john.levon@joyent.com>

@@ -19,10 +19,11 @@
  * CDDL HEADER END
  */
 
 /*
  * Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017 Joyent, Inc.
  */
 
 /*
  * modctl system call for loadable module support.
  */

@@ -3471,10 +3472,15 @@
                 kmem_free(modinfop, sizeof (struct modinfo));
                 (void) mod_sysctl(SYS_SET_MVAR, (void *)mp);
                 retval = install_stubs_by_name(mp, mp->mod_modname);
 
                 /*
+                 * Perform hotinlines before module is started.
+                 */
+                do_hotinlines(mp->mod_mp);
+
+                /*
                  * Now that the module is loaded, we need to give DTrace
                  * a chance to notify its providers.  This is done via
                  * the dtrace_modload function pointer.
                  */
                 if (strcmp(mp->mod_modname, "dtrace") != 0) {