From owner-p4-projects@FreeBSD.ORG  Wed Dec 19 03:10:12 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4C7DF16A419; Wed, 19 Dec 2007 03:10:12 +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 1220916A417
	for <perforce@freebsd.org>; Wed, 19 Dec 2007 03:10:12 +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 1388613C46E
	for <perforce@freebsd.org>; Wed, 19 Dec 2007 03:10:12 +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 lBJ3ABTo005129
	for <perforce@freebsd.org>; Wed, 19 Dec 2007 03:10:11 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBJ3ABIc005126
	for perforce@freebsd.org; Wed, 19 Dec 2007 03:10:11 GMT
	(envelope-from jb@freebsd.org)
Date: Wed, 19 Dec 2007 03:10:11 GMT
Message-Id: <200712190310.lBJ3ABIc005126@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 131200 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: Wed, 19 Dec 2007 03:10:12 -0000

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

Change 131200 by jb@jb_freebsd1 on 2007/12/19 03:09:14

	Update to reflect the latest DTrace hooks strategy and the
	realisation that the cyclic timer subsystem will never come
	out of the CDDL cold.

Affected files ...

.. //depot/projects/dtrace/src/sys/i386/i386/local_apic.c#14 edit

Differences ...

==== //depot/projects/dtrace/src/sys/i386/i386/local_apic.c#14 (text+ko) ====

@@ -35,8 +35,8 @@
 __FBSDID("$FreeBSD: src/sys/i386/i386/local_apic.c,v 1.44 2007/09/11 22:54:09 attilio Exp $");
 
 #include "opt_hwpmc_hooks.h"
+#include "opt_kdtrace.h"
 
-#include "opt_cyclic.h"
 #include "opt_ddb.h"
 
 #include <sys/param.h>
@@ -66,7 +66,10 @@
 #include <ddb/ddb.h>
 #endif
 
+#ifdef KDTRACE_HOOKS
+#include <sys/dtrace_bsd.h>
 cyclic_clock_func_t	lapic_cyclic_clock_func;
+#endif
 
 /* Sanity checks on IDT vectors. */
 CTASSERT(APIC_IO_INTS + APIC_NUM_IOINTS == APIC_TIMER_INT);
@@ -682,8 +685,9 @@
 		else
 			hardclock_cpu(TRAPF_USERMODE(frame));
 
+#ifdef KDTRACE_HOOKS
 		/*
-		 * If the cyclic subsystem is configured and a callback
+		 * If the DTrace hooks are configured and a callback
 		 * function has been registered, then call it to process
 		 * the high speed timers. If this function is registered
 		 * here, then there mustn't be a High Performance Event
@@ -692,6 +696,7 @@
 		 */
 		if (lapic_cyclic_clock_func != NULL)
 			(*lapic_cyclic_clock_func)();
+#endif
 	}
 
 	/* Fire statclock at stathz. */