From owner-p4-projects@FreeBSD.ORG  Sun Apr 23 20:58:45 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 311A216A40F; Sun, 23 Apr 2006 20:58:45 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6E58016A409
	for <perforce@freebsd.org>; Sun, 23 Apr 2006 20:58:44 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9762543D5E
	for <perforce@freebsd.org>; Sun, 23 Apr 2006 20:58:42 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3NKwgfU075063
	for <perforce@freebsd.org>; Sun, 23 Apr 2006 20:58:42 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3NKwgmX075057
	for perforce@freebsd.org; Sun, 23 Apr 2006 20:58:42 GMT
	(envelope-from jb@freebsd.org)
Date: Sun, 23 Apr 2006 20:58:42 GMT
Message-Id: <200604232058.k3NKwgmX075057@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 95952 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: Sun, 23 Apr 2006 20:58:45 -0000

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

Change 95952 by jb@jb_freebsd2 on 2006/04/23 20:57:58

	Backout stuff I never intended to submit.

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_enabling.c#3 edit

Differences ...

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

@@ -288,24 +288,17 @@
 	int i = 0;
 	int matched = 0;
 
-printf("%s:%s(%d): \n",__FUNCTION__,__FILE__,__LINE__);
 	ASSERT(MUTEX_HELD(&cpu_lock));
 	ASSERT(MUTEX_HELD(&dtrace_lock));
 
-printf("%s:%s(%d): enab %p\n",__FUNCTION__,__FILE__,__LINE__,enab);
 	for (i = 0; i < enab->dten_ndesc; i++) {
-printf("%s:%s(%d): \n",__FUNCTION__,__FILE__,__LINE__);
 		dtrace_ecbdesc_t *ep = enab->dten_desc[i];
 
-printf("%s:%s(%d): \n",__FUNCTION__,__FILE__,__LINE__);
 		enab->dten_current = ep;
-printf("%s:%s(%d): \n",__FUNCTION__,__FILE__,__LINE__);
 		enab->dten_error = 0;
 
-printf("%s:%s(%d): \n",__FUNCTION__,__FILE__,__LINE__);
 		matched += dtrace_probe_enable(&ep->dted_probe, enab);
 
-printf("%s:%s(%d): \n",__FUNCTION__,__FILE__,__LINE__);
 		if (enab->dten_error != 0) {
 			/*
 			 * If we get an error half-way through enabling the
@@ -320,25 +313,20 @@
 			 * it would be a result of corrupted DOF in the driver
 			 * properties.
 			 */
-printf("%s:%s(%d): \n",__FUNCTION__,__FILE__,__LINE__);
 			if (nmatched == NULL) {
 				cmn_err(CE_WARN, "dtrace_enabling_match() "
 				    "error on %p: %d", (void *)ep,
 				    enab->dten_error);
 			}
 
-printf("%s:%s(%d): returns\n",__FUNCTION__,__FILE__,__LINE__);
 			return (enab->dten_error);
 		}
 	}
 
-printf("%s:%s(%d): \n",__FUNCTION__,__FILE__,__LINE__);
 	enab->dten_probegen = dtrace_probegen;
-printf("%s:%s(%d): \n",__FUNCTION__,__FILE__,__LINE__);
 	if (nmatched != NULL)
 		*nmatched = matched;
 
-printf("%s:%s(%d): returns\n",__FUNCTION__,__FILE__,__LINE__);
 	return (0);
 }