PERFORCE change 134031 for review

[John Birrell]

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

Change 134031 by jb at jb_freebsd1 on 2008/01/24 22:35:50

	Move the debug.dtrace sysctl node here so that it is more general.
	
	Simplify the thread-specific data to reflect that we only have
	one interrupt level (timer).

Affected files ...

.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#23 edit

Differences ...

==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#23 (text) ====

@@ -288,7 +288,7 @@
 #define PRIV_PROC_ZONE		(1 << 5)
 #define PRIV_ALL		~0
 
-
+SYSCTL_NODE(_debug, OID_AUTO, dtrace, CTLFLAG_RD, 0, "DTrace Information");
 #endif
 
 #if defined(sun)
@@ -415,7 +415,7 @@
 #define	DTRACE_TLS_THRKEY(where) { \
 	solaris_cpu_t *_c = &solaris_cpu[curcpu]; \
 	uint_t intr = 0; \
-	uint_t actv = _c->cpu_intr_actv >> (LOCK_LEVEL + 1); \
+	uint_t actv = _c->cpu_intr_actv; \
 	for (; actv; actv >>= 1) \
 		intr++; \
 	ASSERT(intr < (1 << 3)); \