Module Name: src Committed By: mlelstv Date: Thu Jun 16 06:08:06 UTC 2016
Modified Files: src/external/cddl/osnet/dev/sdt: sdt.c Log Message: Make assertion of linker_file #ifdef __FreeBSD__. Fixes DIAGNOSTIC build. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/external/cddl/osnet/dev/sdt/sdt.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/sdt/sdt.c diff -u src/external/cddl/osnet/dev/sdt/sdt.c:1.15 src/external/cddl/osnet/dev/sdt/sdt.c:1.16 --- src/external/cddl/osnet/dev/sdt/sdt.c:1.15 Sat Feb 6 18:19:59 2016 +++ src/external/cddl/osnet/dev/sdt/sdt.c Thu Jun 16 06:08:06 2016 @@ -39,7 +39,7 @@ * unloaded; in particular, probes may not span multiple kernel modules. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sdt.c,v 1.15 2016/02/06 18:19:59 joerg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sdt.c,v 1.16 2016/06/16 06:08:06 mlelstv Exp $"); #include <sys/cdefs.h> #include <sys/param.h> @@ -257,7 +257,9 @@ sdt_disable(void *arg __unused, dtrace_i { struct sdt_probe *probe = parg; +#ifdef __FreeBSD__ SDT_KASSERT(probe->sdtp_lf->nenabled > 0, ("no probes enabled")); +#endif #ifdef SDT_DEBUG printf("sdt: %s\n", __func__);