From owner-p4-projects@FreeBSD.ORG  Thu Feb 14 21:00:05 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 44BDF16A421; Thu, 14 Feb 2008 21:00:05 +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 09B3A16A41A
	for <perforce@freebsd.org>; Thu, 14 Feb 2008 21:00:04 +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 0570913C46B
	for <perforce@freebsd.org>; Thu, 14 Feb 2008 21:00:05 +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 m1EL04wR033270
	for <perforce@freebsd.org>; Thu, 14 Feb 2008 21:00:04 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1EL041g033267
	for perforce@freebsd.org; Thu, 14 Feb 2008 21:00:04 GMT
	(envelope-from jb@freebsd.org)
Date: Thu, 14 Feb 2008 21:00:04 GMT
Message-Id: <200802142100.m1EL041g033267@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 135413 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: Thu, 14 Feb 2008 21:00:05 -0000

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

Change 135413 by jb@jb_freebsd1 on 2008/02/14 21:00:02

	Fix a silly mistake which blew up the 'free' probe.

Affected files ...

.. //depot/projects/dtrace/src/sys/kern/kern_malloc.c#8 edit

Differences ...

==== //depot/projects/dtrace/src/sys/kern/kern_malloc.c#8 (text+ko) ====

@@ -264,11 +264,13 @@
 		mtsp->mts_size |= 1 << zindx;
 
 #ifdef KDTRACE_HOOKS
-	if (dtrace_malloc_probe != NULL &&
-	    mtip->mti_probes[DTMALLOC_PROBE_MALLOC] != 0)
-		(dtrace_malloc_probe)(mtip->mti_probes[DTMALLOC_PROBE_MALLOC],
-		    (uintptr_t) mtp, (uintptr_t) mtip,
-		    (uintptr_t) mtsp, size, zindx);
+	if (dtrace_malloc_probe != NULL) {
+		uint32_t probe_id = mtip->mti_probes[DTMALLOC_PROBE_MALLOC];
+		if (probe_id != 0)
+			(dtrace_malloc_probe)(probe_id,
+			    (uintptr_t) mtp, (uintptr_t) mtip,
+			    (uintptr_t) mtsp, size, zindx);
+	}
 #endif
 
 	critical_exit();
@@ -301,11 +303,13 @@
 	mtsp->mts_numfrees++;
 
 #ifdef KDTRACE_HOOKS
-	if (dtrace_malloc_probe != NULL &&
-	    mtip->mti_probes[DTMALLOC_PROBE_MALLOC] != 0)
-		(dtrace_malloc_probe)(mtip->mti_probes[DTMALLOC_PROBE_FREE],
-		    (uintptr_t) mtp, (uintptr_t) mtip,
-		    (uintptr_t) mtsp, size, 0);
+	if (dtrace_malloc_probe != NULL) {
+		uint32_t probe_id = mtip->mti_probes[DTMALLOC_PROBE_FREE];
+		if (probe_id != 0)
+			(dtrace_malloc_probe)(probe_id,
+			    (uintptr_t) mtp, (uintptr_t) mtip,
+			    (uintptr_t) mtsp, size, 0);
+	}
 #endif
 
 	critical_exit();