From owner-p4-projects@FreeBSD.ORG  Sun Mar  9 04:32:01 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 48EBA1065675; Sun,  9 Mar 2008 04:32:01 +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 B148C1065671
	for <perforce@freebsd.org>; Sun,  9 Mar 2008 04:32:00 +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 A0EFD8FC19
	for <perforce@freebsd.org>; Sun,  9 Mar 2008 04:32:00 +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 m294W02u030601
	for <perforce@freebsd.org>; Sun, 9 Mar 2008 04:32:00 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m294W0r6030597
	for perforce@freebsd.org; Sun, 9 Mar 2008 04:32:00 GMT
	(envelope-from jb@freebsd.org)
Date: Sun, 9 Mar 2008 04:32:00 GMT
Message-Id: <200803090432.m294W0r6030597@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 137202 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, 09 Mar 2008 04:32:02 -0000

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

Change 137202 by jb@jb_freebsd8 on 2008/03/09 04:31:24

	Fix a mis-merge.

Affected files ...

.. //depot/projects/dtrace/src/sys/sys/proc.h#36 edit

Differences ...

==== //depot/projects/dtrace/src/sys/sys/proc.h#36 (text+ko) ====

@@ -163,6 +163,8 @@
 struct trapframe;
 struct turnstile;
 struct mqueue_notifier;
+struct kdtrace_proc;
+struct kdtrace_thread;
 struct cpuset;
 
 /*
@@ -302,6 +304,8 @@
 	struct kaudit_record	*td_ar;	/* (k) Active audit record, if any. */
 	int		td_syscalls;	/* per-thread syscall count (used by NFS :)) */
 	struct lpohead	td_lprof[2];	/* (a) lock profiling objects. */
+	struct kdtrace_thread	*td_dtrace; /* (*) DTrace-specific data. */
+	int		td_errno;	/* Error returned by last syscall. */
 };
 
 struct mtx *thread_lock_block(struct thread *);
@@ -600,6 +604,7 @@
 	struct p_sched	*p_sched;	/* (*) Scheduler-specific data. */
 	STAILQ_HEAD(, ktr_request)	p_ktr;	/* (o) KTR event queue. */
 	LIST_HEAD(, mqueue_notifier)	p_mqnotifier; /* (c) mqueue notifiers.*/
+	struct kdtrace_proc	*p_dtrace; /* (*) DTrace-specific data. */
 };
 
 #define	p_session	p_pgrp->pg_session