PERFORCE change 137202 for review

[John Birrell]

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

Change 137202 by jb at 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