From owner-p4-projects@FreeBSD.ORG  Sat Dec 22 04:38:13 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6CCD716A468; Sat, 22 Dec 2007 04:38:13 +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 EF15816A41B
	for <perforce@freebsd.org>; Sat, 22 Dec 2007 04:38: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 D274B13C458
	for <perforce@freebsd.org>; Sat, 22 Dec 2007 04:38: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 lBM4cCZ3016010
	for <perforce@freebsd.org>; Sat, 22 Dec 2007 04:38:12 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBM4cCO1016007
	for perforce@freebsd.org; Sat, 22 Dec 2007 04:38:12 GMT
	(envelope-from jb@freebsd.org)
Date: Sat, 22 Dec 2007 04:38:12 GMT
Message-Id: <200712220438.lBM4cCO1016007@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 131413 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: Sat, 22 Dec 2007 04:38:13 -0000

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

Change 131413 by jb@jb_freebsd1 on 2007/12/22 04:37:26

	Update to allow for the fact that parts of CDDL'd structures don't
	really belong in the BSD licensed struct pcpu.

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/kern/kern_cyclic.c#5 edit

Differences ...

==== //depot/projects/dtrace/src/sys/cddl/kern/kern_cyclic.c#5 (text+ko) ====

@@ -26,15 +26,6 @@
  *
  */
 
-#include <sys/cdefs.h>
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/conf.h>
-#include <sys/kernel.h>
-#include <sys/module.h>
-#include <sys/pcpu.h>
-#include <sys/cyclic.h>
-
 /*
  *  Cyclic subsystem initialisation.
  */
@@ -60,18 +51,17 @@
  * This function is the one registered by the machine dependent
  * initialiser as the callback for high speed timer events.
  */
-void
+static void
 cyclic_clock(void)
 {
-	/* Cyclic timers are hooked into the per-cpu structure. */
-	struct pcpu *pc = pcpu_find(curcpu);
+	cpu_t *c = &cyclic_cpu[curcpu];
 
-	pc->pc_intr_actv |= (1 << CY_HIGH_LEVEL);
+	c->cpu_intr_actv |= (1 << CY_HIGH_LEVEL);
 
 	/* Fire any timers that are due. */
-	cyclic_fire(pc);
+	cyclic_fire(c);
 
-	pc->pc_intr_actv &= ~(1 << CY_HIGH_LEVEL);
+	c->cpu_intr_actv &= ~(1 << CY_HIGH_LEVEL);
 }
 
 /* ARGSUSED */