From owner-p4-projects@FreeBSD.ORG  Mon Apr 24 23:32:41 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 60FC016A409; Mon, 24 Apr 2006 23:32:41 +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 2665F16A404
	for <perforce@freebsd.org>; Mon, 24 Apr 2006 23:32:41 +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 E571D43D49
	for <perforce@freebsd.org>; Mon, 24 Apr 2006 23:32:40 +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 k3ONWeec008997
	for <perforce@freebsd.org>; Mon, 24 Apr 2006 23:32:40 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3ONWeRq008991
	for perforce@freebsd.org; Mon, 24 Apr 2006 23:32:40 GMT
	(envelope-from jb@freebsd.org)
Date: Mon, 24 Apr 2006 23:32:40 GMT
Message-Id: <200604242332.k3ONWeRq008991@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 96028 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: Mon, 24 Apr 2006 23:32:41 -0000

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

Change 96028 by jb@jb_freebsd2 on 2006/04/24 23:32:39

	The latest hacks.

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_hacks.h#7 edit

Differences ...

==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_hacks.h#7 (text+ko) ====

@@ -18,12 +18,20 @@
 void vmem_free(vmem_t *, void *, size_t);
 void vmem_destroy(vmem_t *);
 
+#undef curthread
+#define curthread       	((struct thread *) PCPU_GET(curthread))
+#define	t_dtrace_start		td_dtrace_start
+#define	t_dtrace_vtime		td_dtrace_vtime
+#define	t_predcache		td_predcache
+#define ttoproc(_a)		((_d)->th_proc)
+
 typedef dtrace_mutex_t		kmutex_t;
 #define	mutex_enter(_a)		dtrace_mutex_lock(_a)
 #define	mutex_exit(_a)		dtrace_mutex_unlock(_a)
 #define MUTEX_HELD(_a)		((_a)->dm_owner == curthread)
 #define MUTEX_NOT_HELD(_a)	((_a)->dm_owner != curthread)
 
+#define	mod_modname		pathname
 #define	crgetuid(_a)		_a->cr_uid
 #define	crgetzoneid(_a)		0
 #define KM_SLEEP		M_WAITOK
@@ -31,7 +39,7 @@
 #define kmem_zalloc(_a,_b)	malloc(_a, M_DTRACE, _b | M_ZERO)
 #define kmem_alloc(_a,_b)	malloc(_a, M_DTRACE, _b)
 #define kmem_free(_a,_b)	free(_a, M_DTRACE)
-#define	NCPU			mp_ncpus
+#define	NCPU			(mp_maxid + 1)
 #define delay(_a)		DELAY(_a)
 #define vuprintf		vprintf
 #define CRED()			curthread->td_ucred