 @@ -1,14 +1,14 @@
-/*	$NetBSD: fbt.c,v 1.18.2.1 2016/07/16 11:27:12 pgoyette Exp $	*/
+/*	$NetBSD: fbt.c,v 1.18.2.2 2016/07/17 05:18:11 pgoyette Exp $	*/
 /*
  * CDDL HEADER START
+ *
  * The contents of this file are subject to the terms of the
  * Common Development and Distribution License (the "License").
  * You may not use this file except in compliance with the License.
+ *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
  * See the License for the specific language governing permissions
  * and limitations under the License.
+ *
 @@ -46,26 +46,27 @@
 #include <sys/kthread.h>
 #include <sys/limits.h>
 #include <sys/linker.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/mutex.h>
 #include <sys/poll.h>
 #include <sys/proc.h>
 #include <sys/selinfo.h>
 #include <sys/syscall.h>
 #include <sys/uio.h>
 #include <sys/unistd.h>
 #include <sys/localcount.h>
 #include <machine/cpu.h>
 #if defined(__i386__) || defined(__amd64__)
 #include <machine/cpufunc.h>
 #include <machine/specialreg.h>
 #if 0
 #include <x86/cpuvar.h>
 #endif
 #include <x86/cputypes.h>
 #elif __arm__
 #include <machine/trap.h>
 #include <arm/cpufunc.h>
 #include <arm/armreg.h>
 @@ -141,30 +142,42 @@ static void	fbt_getargdesc(void *, dtrac
 static void	fbt_provide_module(void *, dtrace_modctl_t *);
 static void	fbt_destroy(void *, dtrace_id_t, void *);
 static int	fbt_enable(void *, dtrace_id_t, void *);
 static void	fbt_disable(void *, dtrace_id_t, void *);
 static void	fbt_load(void);
 static void	fbt_suspend(void *, dtrace_id_t, void *);
 static void	fbt_resume(void *, dtrace_id_t, void *);
 #define	FBT_ENTRY	"entry"
 #define	FBT_RETURN	"return"
 #define	FBT_ADDR2NDX(addr)	((((uintptr_t)(addr)) >> 4) & fbt_probetab_mask)
 #define	FBT_PROBETAB_SIZE	0x8000		/* 32k entries -- 128K total */
 struct localcount fbt_localcount;
 static const struct cdevsw fbt_cdevsw = {
-	fbt_open, noclose, noread, nowrite, noioctl,
+	.d_open		= fbt_open,
-	nostop, notty, nopoll, nommap, nokqfilter, nodiscard,
+	.d_close	= noclose,
-	D_OTHER, NULL
+	.d_read		= noread,
 	.d_write	= nowrite,
 	.d_ioctl	= noioctl,
 	.d_stop		= nostop,
 	.d_tty		= notty,
 	.d_poll		= nopoll,
 	.d_mmap		= nommap,
 	.d_kqfilter	= nokqfilter,
 	.d_discard	= nodiscard,
 	.d_localcount	= fbt_localcount,
 	.d_flag		= D_OTHER
 };
 static dtrace_pattr_t fbt_attr = {
 { DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_COMMON },
 { DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
 { DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_ISA },
 { DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_COMMON },
 { DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_ISA },
 };
 static dtrace_pops_t fbt_pops = {
 	NULL,
 	fbt_provide_module,

 @@ -29,51 +29,52 @@
  * framework for DTrace. Probes and SDT providers are defined using the macros
  * in sys/sdt.h, which append all the needed structures to linker sets. When
  * this module is loaded, it iterates over all of the loaded modules and
  * registers probes and providers with the DTrace framework based on the
  * contents of these linker sets.
+ *
  * A list of SDT providers is maintained here since a provider may span multiple
  * modules. When a kernel module is unloaded, a provider defined in that module
  * is unregistered only if no other modules refer to it. The DTrace framework is
  * responsible for destroying individual probes when a kernel module is
  * unloaded; in particular, probes may not span multiple kernel modules.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdt.c,v 1.16.2.1 2016/07/16 11:27:12 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdt.c,v 1.16.2.2 2016/07/17 05:18:11 pgoyette Exp $");
 #include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
 #ifdef __FreeBSD__
 #include <sys/eventhandler.h>
 #endif
 #include <sys/kernel.h>
 #include <sys/limits.h>
 #ifdef __FreeBSD__
 #include <sys/linker.h>
 #include <sys/linker_set.h>
 #endif
 #include <sys/lock.h>
 #ifdef __FreeBSD__
 #include <sys/lockstat.h>
 #endif
 #include <sys/malloc.h>
 #include <sys/kmem.h>
 #include <sys/module.h>
 #include <sys/mutex.h>
 #include <sys/queue.h>
 #include <sys/localcount.h>
 #define KDTRACE_HOOKS
 #include <sys/sdt.h>
 #include <sys/dtrace.h>
 #include <sys/dtrace_bsd.h>
 /* DTrace methods. */
 static void	sdt_getargdesc(void *, dtrace_id_t, void *, dtrace_argdesc_t *);
 static void	sdt_provide_probes(void *, const dtrace_probedesc_t *);
 static void	sdt_destroy(void *, dtrace_id_t, void *);
 static int	sdt_enable(void *, dtrace_id_t, void *);
 static void	sdt_disable(void *, dtrace_id_t, void *);
 @@ -108,33 +109,45 @@ static dtrace_pops_t sdt_pops = {
 	sdt_getargdesc,
 	NULL,
 	NULL,
 	sdt_destroy,
 };
 #ifdef __NetBSD__
 static int
 sdt_open(dev_t dev, int flags, int mode, struct lwp *l)
+{
 	return (0);
+}
 struct localcount sdt_localcount;
 static const struct cdevsw sdt_cdevsw = {
-	sdt_open, noclose, noread, nowrite, noioctl,
+	.d_open		= sdt_open,
-	nostop, notty, nopoll, nommap, nokqfilter, nodiscard,
+	.d_close	= noclose,
-	D_OTHER, NULL
+	.d_read		= noread,
 	.d_write	= nowrite,
 	.d_ioctl	= noioctl,
 	.d_stop		= nostop,
 	.d_tty		= notty,
 	.d_poll		= nopoll,
 	.d_mmap		= nommap,
 	.d_kqfilter	= nokqfilter,
 	.d_discard	= nodiscard,
 	.d_localcount	= sdt_localcount,
 	.d_flag		= D_OTHER
 };
 #endif
 static TAILQ_HEAD(, sdt_provider) sdt_prov_list;
 #ifdef __FreeBSD__
 eventhandler_tag	sdt_kld_load_tag;
 eventhandler_tag	sdt_kld_unload_try_tag;
 #endif
 #ifdef __NetBSD__
 static char *
 strdup(const char *s, const struct malloc_type *m)
+{
 	size_t l = strlen(s) + 1;
 	char *d = malloc(l, m, M_WAITOK);

 @@ -124,26 +124,27 @@
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/sysctl.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/rwlock.h>
 //#include <sys/sx.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/dtrace_bsd.h>
 #include <sys/vmem.h>
 #include <sys/module.h>
 #include <sys/cpu.h>
 #include <sys/localcount.h>
 #include <netinet/in.h>
 #include "dtrace_cddl.h"
 #include "dtrace_debug.c"
 #endif
 #if !defined(sun)
 /* fake module entry for netbsd */
 module_t *mod_nbsd = NULL;
 #endif
 /*
  * DTrace Tunable Variables
+ *
 @@ -15327,30 +15328,43 @@ dtrace_attach(dev_info_t *devi, ddi_atta
 #if __FreeBSD_version >= 800039
 static void
 dtrace_dtr(void *data __unused)
+{
+}
 #endif
 #endif
 #if !defined(sun)
 static dev_type_open(dtrace_open);
 /* Pseudo Device Entry points */
 /* Just opens, clones to the fileops below */
 struct localcount dtrace_localcount;
 const struct cdevsw dtrace_cdevsw = {
-	dtrace_open, noclose, noread, nowrite, noioctl,
+	.d_open		= dtrace_open,
-	nostop, notty, nopoll, nommap, nokqfilter, nodiscard,
+	.d_close	= noclose,
-	D_OTHER | D_MPSAFE, NULL
+	.d_read		= noread,
 	.d_write	= nowrite,
 	.d_ioctl	= noioctl,
 	.d_stop		= nostop,
 	.d_tty		= notty,
 	.d_poll		= nopoll,
 	.d_mmap		= nommap,
 	.d_kqfilter	= nokqfilter,
 	.d_discard	= nodiscard,
 	.d_localcount	= dtrace_localcount,
 	.d_flag		= D_OTHER | D_MPSAFE
 };
 static int dtrace_ioctl(struct file *fp, u_long cmd, void *data);
 static int dtrace_close(struct file *fp);
 static const struct fileops dtrace_fileops = {
 	.fo_read = fbadop_read,
 	.fo_write = fbadop_write,
 	.fo_ioctl = dtrace_ioctl,
 	.fo_fcntl = fnullop_fcntl,
 	.fo_poll = fnullop_poll,
 	.fo_stat = fbadop_stat,
 	.fo_close = dtrace_close,