From owner-p4-projects@FreeBSD.ORG  Sun Mar 23 20:25:39 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6752D1065672; Sun, 23 Mar 2008 20:25:39 +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 271611065670
	for <perforce@freebsd.org>; Sun, 23 Mar 2008 20:25:39 +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 10E728FC21
	for <perforce@freebsd.org>; Sun, 23 Mar 2008 20:25:39 +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 m2NKPciu099030
	for <perforce@freebsd.org>; Sun, 23 Mar 2008 20:25:39 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2NKPcWC099028
	for perforce@freebsd.org; Sun, 23 Mar 2008 20:25:38 GMT
	(envelope-from jb@freebsd.org)
Date: Sun, 23 Mar 2008 20:25:38 GMT
Message-Id: <200803232025.m2NKPcWC099028@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 138381 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 Mar 2008 20:25:39 -0000

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

Change 138381 by jb@jb_freebsd1 on 2008/03/23 20:24:44

	Tidy up before commit to current.

Affected files ...

.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#44 edit

Differences ...

==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#44 (text) ====

@@ -2761,8 +2761,8 @@
 
 		return (mstate->dtms_arg[ndx]);
 
+#if defined(sun)
 	case DIF_VAR_UREGS: {
-#ifdef DOODAD
 		klwp_t *lwp;
 
 		if (!dtrace_priv_proc(state))
@@ -2775,11 +2775,9 @@
 		}
 
 		return (dtrace_getreg(lwp->lwp_regs, ndx));
-#else
-printf("%s(%d): DOODAD\n",__func__,__LINE__);
 		return (0);
+	}
 #endif
-	}
 
 	case DIF_VAR_CURTHREAD:
 		if (!dtrace_priv_kernel(state))
@@ -5647,8 +5645,8 @@
 dtrace_action_ustack(dtrace_mstate_t *mstate, dtrace_state_t *state,
     uint64_t *buf, uint64_t arg)
 {
-printf("%s(%d): DOODAD\n",__func__,__LINE__);
-#ifdef DOODAD
+	printf("%s(%d): unimplemented.\n",__func__,__LINE__);
+#if defined(sun)
 	int nframes = DTRACE_USTACK_NFRAMES(arg);
 	int strsize = DTRACE_USTACK_STRSIZE(arg);
 	uint64_t *pcs = &buf[1], *fps;