PERFORCE change 131408 for review

[John Birrell]

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

Change 131408 by jb at jb_freebsd1 on 2007/12/22 04:31:53

	Include the machine-dependent code and the backend so that the functions
	can all be static.

Affected files ...

.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/os/cyclic.c#6 edit

Differences ...

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

@@ -563,6 +563,10 @@
 #include <sys/ddi.h>
 #else
 #include <sys/dtrace_bsd.h>
+#include <sys/bus.h>
+#include <sys/interrupt.h>
+#include <sys/kernel.h>
+#include <sys/conf.h>
 #define gethrtime_unscaled	dtrace_gethrtime
 static cyclic_cpu_t	cyclic_cpu[MAXCPU];
 static kmutex_t		cpu_lock;
@@ -2172,7 +2176,6 @@
 	c->cpu_cyclic = cpu;
 }
 
-#if defined(sun)
 static void
 cyclic_unconfigure(cpu_t *c)
 {
@@ -2225,7 +2228,6 @@
 
 	c->cpu_cyclic = NULL;
 }
-#endif
 
 #if defined(sun)
 static int
@@ -2932,6 +2934,26 @@
 	mutex_exit(&cpu_lock);
 }
 
+#if !defined(sun)
+static void
+cyclic_uninit(void)
+{
+	struct pcpu *pc;
+	cpu_t *c;
+	int id;
+
+	for (id = 0; id <= mp_maxid; id++) {
+		if ((pc = pcpu_find(id)) == NULL)
+			continue;
+
+		c = &cyclic_cpu[pc->pc_cpuid];
+
+		cyclic_offline(c);
+		cyclic_unconfigure(c);
+	}
+}
+#endif
+
 /*
  *  int cyclic_juggle(cpu_t *)
  *
@@ -3430,3 +3452,8 @@
 	}
 #endif
 }
+
+#if !defined(sun)
+#include "cyclic_machdep.c"
+#include "kern_cyclic.c"
+#endif