From owner-p4-projects@FreeBSD.ORG  Mon Dec 31 04:27:49 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A287316A417; Mon, 31 Dec 2007 04:27:49 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3192116A468
	for <perforce@freebsd.org>; Mon, 31 Dec 2007 04:27:49 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 222BE13C45B
	for <perforce@freebsd.org>; Mon, 31 Dec 2007 04:27:49 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBV4Rmko059007
	for <perforce@freebsd.org>; Mon, 31 Dec 2007 04:27:48 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBV4RmPl059004
	for perforce@freebsd.org; Mon, 31 Dec 2007 04:27:48 GMT
	(envelope-from jb@freebsd.org)
Date: Mon, 31 Dec 2007 04:27:48 GMT
Message-Id: <200712310427.lBV4RmPl059004@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 132148 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 31 Dec 2007 04:27:50 -0000

http://perforce.freebsd.org/chv.cgi?CH=132148

Change 132148 by jb@jb_freebsd1 on 2007/12/31 04:27:40

	Remove the M_DTRACE memory type and be consistent about using the
	kmem implementation in the opensolaris module.

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_load.c#21 edit
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_sysctl.c#3 edit
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_unload.c#18 edit

Differences ...

==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_load.c#21 (text+ko) ====

@@ -145,7 +145,7 @@
 	if (dtrace_helptrace_enabled) {
 		ASSERT(dtrace_helptrace_buffer == NULL);
 		dtrace_helptrace_buffer =
-		    malloc(dtrace_helptrace_bufsize, M_DTRACE, M_NOWAIT | M_ZERO);
+		    kmem_zalloc(dtrace_helptrace_bufsize, KM_SLEEP);
 		dtrace_helptrace_next = 0;
 	}
 

==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_sysctl.c#3 (text+ko) ====

@@ -47,7 +47,7 @@
 		prov = prov->dtpv_next;
 	}
 
-	if ((p_name = malloc(len, M_DTRACE, M_NOWAIT)) == NULL)
+	if ((p_name = kmem_alloc(len, KM_SLEEP)) == NULL)
 		error = ENOMEM;
 	else {
 		/* Start with an empty string. */
@@ -73,7 +73,7 @@
 	if (p_name != NULL) {
 		error = sysctl_handle_string(oidp, p_name, len, req);
 
-		free(p_name, M_DTRACE);
+		kmem_free(p_name, 0);
 	}
 
 	return (error);

==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_unload.c#18 (text+ko) ====

@@ -103,7 +103,7 @@
 	mutex_exit(&cpu_lock);
 
 	if (dtrace_helptrace_enabled) {
-		free(dtrace_helptrace_buffer, M_DTRACE);
+		kmem_free(dtrace_helptrace_buffer, 0);
 		dtrace_helptrace_buffer = NULL;
 	}