From owner-p4-projects@FreeBSD.ORG  Fri Jan  4 03:18:24 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7C91716A468; Fri,  4 Jan 2008 03:18:24 +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 426FD16A41B
	for <perforce@freebsd.org>; Fri,  4 Jan 2008 03:18:24 +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 3219313C458
	for <perforce@freebsd.org>; Fri,  4 Jan 2008 03:18:24 +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 m043IOQ0005563
	for <perforce@freebsd.org>; Fri, 4 Jan 2008 03:18:24 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m043INTl005560
	for perforce@freebsd.org; Fri, 4 Jan 2008 03:18:23 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 4 Jan 2008 03:18:23 GMT
Message-Id: <200801040318.m043INTl005560@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 132452 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: Fri, 04 Jan 2008 03:18:24 -0000

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

Change 132452 by jb@jb_freebsd1 on 2008/01/04 03:18:02

	Update to reflect the fact that the interrupt levels aren't valid on FreeBSD.

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/dev/profile/profile.c#4 edit
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#10 edit

Differences ...

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

@@ -407,7 +407,6 @@
 
 	hdlr->cyh_func = profile_fire;
 	hdlr->cyh_arg = pcpu;
-	hdlr->cyh_level = CY_HIGH_LEVEL;
 
 	when->cyt_interval = prof->prof_interval;
 	when->cyt_when = dtrace_gethrtime() + when->cyt_interval;
@@ -441,7 +440,6 @@
 	if (prof->prof_kind == PROF_TICK) {
 		hdlr.cyh_func = profile_tick;
 		hdlr.cyh_arg = prof;
-		hdlr.cyh_level = CY_HIGH_LEVEL;
 
 		when.cyt_interval = prof->prof_interval;
 		when.cyt_when = dtrace_gethrtime() + when.cyt_interval;

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

@@ -12840,7 +12840,9 @@
 
 	hdlr.cyh_func = (cyc_func_t)dtrace_state_clean;
 	hdlr.cyh_arg = state;
+#if defined(sun)
 	hdlr.cyh_level = CY_LOW_LEVEL;
+#endif
 
 	when.cyt_when = 0;
 	when.cyt_interval = opt[DTRACEOPT_CLEANRATE];
@@ -12849,7 +12851,9 @@
 
 	hdlr.cyh_func = (cyc_func_t)dtrace_state_deadman;
 	hdlr.cyh_arg = state;
+#if defined(sun)
 	hdlr.cyh_level = CY_LOW_LEVEL;
+#endif
 
 	when.cyt_when = 0;
 	when.cyt_interval = dtrace_deadman_interval;