PERFORCE change 131413 for review

[John Birrell]

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

Change 131413 by jb at 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 */