From owner-p4-projects@FreeBSD.ORG  Sun May 14 06:23:19 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 7ABFA16A411; Sun, 14 May 2006 06:23:18 +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 1DAAE16A417
	for <perforce@freebsd.org>; Sun, 14 May 2006 06:23:18 +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 2D38843D5E
	for <perforce@freebsd.org>; Sun, 14 May 2006 06:23:17 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4E6NBgo009256
	for <perforce@freebsd.org>; Sun, 14 May 2006 06:23:11 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4E6NBS4009253
	for perforce@freebsd.org; Sun, 14 May 2006 06:23:11 GMT
	(envelope-from jb@freebsd.org)
Date: Sun, 14 May 2006 06:23:11 GMT
Message-Id: <200605140623.k4E6NBS4009253@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 97133 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: Sun, 14 May 2006 06:23:20 -0000

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

Change 97133 by jb@jb_freebsd2 on 2006/05/14 06:23:05

	Re-enable the enable/disable of interrupts. This was not the cause of
	the lockup I was seeing.

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/i386/cyclic_machdep.c#4 edit

Differences ...

==== //depot/projects/dtrace/src/sys/cddl/i386/cyclic_machdep.c#4 (text+ko) ====

@@ -188,18 +188,12 @@
 
 static cyc_cookie_t set_level(cyb_arg_t arg, cyc_level_t level)
 {
-#ifdef DOODAD
 	return (intr_disable());
-#else
-	return (0);
-#endif
 }
 
 static void restore_level(cyb_arg_t arg, cyc_cookie_t cookie)
 {
-#ifdef DOODAD
 	intr_restore(cookie);
-#endif
 }
 
 static void xcall(cyb_arg_t arg, cpu_t *c, cyc_func_t func, void *param)