From owner-p4-projects@FreeBSD.ORG  Thu Jan 24 22:36:36 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EEB7516A421; Thu, 24 Jan 2008 22:36:35 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9AC4316A41A
	for <perforce@freebsd.org>; Thu, 24 Jan 2008 22:36:35 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 8884F13C45D
	for <perforce@freebsd.org>; Thu, 24 Jan 2008 22:36:35 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0OMaZXX023380
	for <perforce@freebsd.org>; Thu, 24 Jan 2008 22:36:35 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0OMaZnN023377
	for perforce@freebsd.org; Thu, 24 Jan 2008 22:36:35 GMT
	(envelope-from jb@freebsd.org)
Date: Thu, 24 Jan 2008 22:36:35 GMT
Message-Id: <200801242236.m0OMaZnN023377@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 134031 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: Thu, 24 Jan 2008 22:36:36 -0000

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

Change 134031 by jb@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)); \