[Midnightbsd-cvs] src [9152] trunk/sys/cddl/dev: sync with freebsd 9.2

[laffer1 at midnightbsd.org]

Revision: 9152
          http://svnweb.midnightbsd.org/src/?rev=9152
Author:   laffer1
Date:     2016-10-13 22:00:33 -0400 (Thu, 13 Oct 2016)
Log Message:
-----------
sync with freebsd 9.2

Modified Paths:
--------------
    trunk/sys/cddl/dev/cyclic/cyclic.c
    trunk/sys/cddl/dev/cyclic/cyclic_test.c
    trunk/sys/cddl/dev/cyclic/i386/cyclic_machdep.c
    trunk/sys/cddl/dev/dtmalloc/dtmalloc.c

Modified: trunk/sys/cddl/dev/cyclic/cyclic.c
===================================================================
--- trunk/sys/cddl/dev/cyclic/cyclic.c	2016-10-14 02:00:08 UTC (rev 9151)
+++ trunk/sys/cddl/dev/cyclic/cyclic.c	2016-10-14 02:00:33 UTC (rev 9152)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * CDDL HEADER START
  *
@@ -21,7 +22,7 @@
  *
  * Portions Copyright 2008 John Birrell <jb at freebsd.org>
  *
- * $MidnightBSD$
+ * $FreeBSD: release/9.2.0/sys/cddl/dev/cyclic/cyclic.c 249132 2013-04-05 08:22:11Z mav $
  *
  * This is a simplified version of the cyclic timer subsystem from
  * OpenSolaris. In the FreeBSD version, we don't use interrupt levels.

Modified: trunk/sys/cddl/dev/cyclic/cyclic_test.c
===================================================================
--- trunk/sys/cddl/dev/cyclic/cyclic_test.c	2016-10-14 02:00:08 UTC (rev 9151)
+++ trunk/sys/cddl/dev/cyclic/cyclic_test.c	2016-10-14 02:00:33 UTC (rev 9152)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright 2007 John Birrell <jb at FreeBSD.org>
  *
@@ -22,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: release/9.2.0/sys/cddl/dev/cyclic/cyclic_test.c 179260 2008-05-23 22:21:58Z jb $
  *
  */
 

Modified: trunk/sys/cddl/dev/cyclic/i386/cyclic_machdep.c
===================================================================
--- trunk/sys/cddl/dev/cyclic/i386/cyclic_machdep.c	2016-10-14 02:00:08 UTC (rev 9151)
+++ trunk/sys/cddl/dev/cyclic/i386/cyclic_machdep.c	2016-10-14 02:00:33 UTC (rev 9152)
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $MidnightBSD$
+ * $FreeBSD: release/9.2.0/sys/cddl/dev/cyclic/i386/cyclic_machdep.c 222813 2011-06-07 08:46:13Z attilio $
  *
  */
 

Modified: trunk/sys/cddl/dev/dtmalloc/dtmalloc.c
===================================================================
--- trunk/sys/cddl/dev/dtmalloc/dtmalloc.c	2016-10-14 02:00:08 UTC (rev 9151)
+++ trunk/sys/cddl/dev/dtmalloc/dtmalloc.c	2016-10-14 02:00:33 UTC (rev 9152)
@@ -1,4 +1,3 @@
-/* $MidnightBSD$ */
 /*
  * CDDL HEADER START
  *
@@ -21,7 +20,7 @@
  *
  * Portions Copyright 2006-2008 John Birrell jb at freebsd.org
  *
- * $FreeBSD: src/sys/cddl/dev/dtmalloc/dtmalloc.c,v 1.1.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $
+ * $FreeBSD: release/9.2.0/sys/cddl/dev/dtmalloc/dtmalloc.c 252860 2013-07-06 03:39:40Z markj $
  *
  */
 
@@ -29,6 +28,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
+#include <sys/ctype.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
@@ -112,8 +112,17 @@
 {
 	char name[DTRACE_FUNCNAMELEN];
 	struct malloc_type_internal *mtip = mtp->ks_handle;
+	int i;
 
+	/*
+	 * malloc_type descriptions are allowed to contain whitespace, but
+	 * DTrace probe identifiers are not, so replace the whitespace with
+	 * underscores.
+	 */
 	strlcpy(name, mtp->ks_shortdesc, sizeof(name));
+	for (i = 0; name[i] != 0; i++)
+		if (isspace(name[i]))
+			name[i] = '_';
 
 	if (dtrace_probe_lookup(dtmalloc_id, NULL, name, "malloc") != 0)
 		return;