PERFORCE change 96269 for review

[John Birrell]

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

Change 96269 by jb at jb_freebsd2 on 2006/04/27 23:01:41

	Remove my hacked interrupt enable/disable functions and map FreeBSD's
	ones directly to the dttrace dunction names because the model
	matches.
	
	Thanks to jhb at .

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_hacks.c#11 edit
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_hacks.h#9 edit

Differences ...

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

@@ -161,17 +161,6 @@
 	printf("%s:\n",__FUNCTION__);
 	return NULL;
 }
-dtrace_icookie_t
-dtrace_interrupt_disable(void)
-{
-	disable_intr();
-	return (0);
-}
-void
-dtrace_interrupt_enable(dtrace_icookie_t a)
-{
-	enable_intr();
-}
 void
 dtrace_getpcstack(pc_t *a, int b, int c, uint32_t *d)
 {

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

@@ -29,6 +29,10 @@
 #define MUTEX_HELD(_a)		((_a)->dm_owner == curthread)
 #define MUTEX_NOT_HELD(_a)	((_a)->dm_owner != curthread)
 
+#define dtrace_icookie_t	register_t
+#define dtrace_interrupt_disable	intr_disable
+#define dtrace_interrupt_enable	intr_restore
+
 #define	mod_modname		pathname
 #define	crgetuid(_a)		_a->cr_uid
 #define	crgetzoneid(_a)		0