PERFORCE change 96028 for review

[John Birrell]

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

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