From owner-p4-projects@FreeBSD.ORG  Thu Apr 27 23:01:55 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 4A55316A406; Thu, 27 Apr 2006 23:01:55 +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 2128416A404
	for <perforce@freebsd.org>; Thu, 27 Apr 2006 23:01:55 +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 C841243D48
	for <perforce@freebsd.org>; Thu, 27 Apr 2006 23:01:54 +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 k3RN1saY066071
	for <perforce@freebsd.org>; Thu, 27 Apr 2006 23:01:54 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3RN1so9066068
	for perforce@freebsd.org; Thu, 27 Apr 2006 23:01:54 GMT
	(envelope-from jb@freebsd.org)
Date: Thu, 27 Apr 2006 23:01:54 GMT
Message-Id: <200604272301.k3RN1so9066068@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 96269 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, 27 Apr 2006 23:01:55 -0000

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

Change 96269 by jb@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@.

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