From owner-p4-projects@FreeBSD.ORG  Wed Jul  5 01:55:25 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 D4F4116A4DF; Wed,  5 Jul 2006 01:55:24 +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 5C48416A4DD
	for <perforce@freebsd.org>; Wed,  5 Jul 2006 01:55:24 +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 2C1ED43D4C
	for <perforce@freebsd.org>; Wed,  5 Jul 2006 01:55:24 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k651tOqv033606
	for <perforce@freebsd.org>; Wed, 5 Jul 2006 01:55:24 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k651tNV2033602
	for perforce@freebsd.org; Wed, 5 Jul 2006 01:55:23 GMT
	(envelope-from jb@freebsd.org)
Date: Wed, 5 Jul 2006 01:55:23 GMT
Message-Id: <200607050155.k651tNV2033602@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 100594 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: Wed, 05 Jul 2006 01:55:25 -0000

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

Change 100594 by jb@jb_freebsd2 on 2006/07/05 01:54:23

	The statically defined trace implementation needs to change
	to match the way that Sun did. For the time being, just
	ensure that this file will compile on sun4v.

Affected files ...

.. //depot/projects/dtrace/src/sys/kern/kern_sdt.c#3 edit

Differences ...

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

@@ -130,17 +130,6 @@
 		ref->state = SDT_OFFSET_TOO_BIG;
 		return;
 	}
-/* XXX This is temporary code to help determine if this strategy is sound. */
-{
-u_int8_t *p1 = (u_int8_t *) ref->probe_start;
-u_int8_t *p2 = (u_int8_t *) ref->probe_end;
-printf("sdt:%s:%s:%s:\n", ref->mod, ref->func, ref->name);
-while (p1 < p2) {
-	printf("0x%02x ",*p1 & 0xff);
-	p1++;
-}
-printf("\n");
-}
 
 	/*
 	 * Point to the instruction after the start probe label.
@@ -175,7 +164,7 @@
 	 */
 	*p = ref->probe_disable;
 #else
-#error "Need machine dependent code!"
+	printf("%s: Need machine dependent code!\n",__FUNCTION__);
 #endif
 
 	sx_xlock(&sdt_sx);