From owner-p4-projects@FreeBSD.ORG  Sun Apr 23 00:21:59 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 16E4616A406; Sun, 23 Apr 2006 00:21:59 +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 D15AB16A402
	for <perforce@freebsd.org>; Sun, 23 Apr 2006 00:21:58 +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 1EAB943D4C
	for <perforce@freebsd.org>; Sun, 23 Apr 2006 00:21:58 +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 k3N0LwaG046221
	for <perforce@freebsd.org>; Sun, 23 Apr 2006 00:21:58 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3N0LvxB046215
	for perforce@freebsd.org; Sun, 23 Apr 2006 00:21:57 GMT
	(envelope-from jb@freebsd.org)
Date: Sun, 23 Apr 2006 00:21:57 GMT
Message-Id: <200604230021.k3N0LvxB046215@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 95914 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 00:21:59 -0000

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

Change 95914 by jb@jb_freebsd2 on 2006/04/23 00:21:56

	On FreeBSD, track the device via it's struct cdev pointer.
	
	(And since my previous submit included a lot of work-in-progress
	updates by mistake... and since it looks awkward to backout that
	change... why doesn't perforce have a 'p4 backout xyz' command?
	... this completes my work-in-progress update... all this code
	should build and run)

Affected files ...

.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dtrace_impl.h#4 edit

Differences ...

==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/dtrace_impl.h#4 (text) ====

@@ -1101,7 +1101,11 @@
  * dtrace_state structure.
  */
 struct dtrace_state {
+#if defined(sun)
 	dev_t dts_dev;				/* device */
+#else
+	struct cdev *dts_dev;			/* device */
+#endif
 	int dts_necbs;				/* total number of ECBs */
 	dtrace_ecb_t **dts_ecbs;		/* array of ECBs */
 	dtrace_epid_t dts_epid;			/* next EPID to allocate */