The amd64 version of the cyclic dtrace module is a verbatim copy of the

i386 version, so instead having a copy of the same file, use Makefile
foo to include the i386 version on amd64.

2 files changed, 1 insertions, 134 deletions

diff --git a/sys/cddl/dev/cyclic/amd64/cyclic_machdep.c b/sys/cddl/dev/cyclic/amd64/cyclic_machdep.c
deleted file mode 100644
index 9a15b2c..0000000
--- a/sys/cddl/dev/cyclic/amd64/cyclic_machdep.c
+++ /dev/null
@@ -1,133 +0,0 @@
-/*-
- * Copyright 2007 John Birrell <jb@FreeBSD.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- *
- */
-
-static void enable(cyb_arg_t);
-static void disable(cyb_arg_t);
-static void reprogram(cyb_arg_t, hrtime_t);
-static void xcall(cyb_arg_t, cpu_t *, cyc_func_t, void *);
-
-static cyc_backend_t	be	= {
-	NULL,		/* cyb_configure */
-	NULL,		/* cyb_unconfigure */
-	enable,
-	disable,
-	reprogram,
-	xcall,
-	NULL		/* cyb_arg_t cyb_arg */
-};
-
-static void
-cyclic_ap_start(void *dummy)
-{
-	/* Initialise the rest of the CPUs. */
-	cyclic_mp_init();
-}
-
-SYSINIT(cyclic_ap_start, SI_SUB_SMP, SI_ORDER_ANY, cyclic_ap_start, NULL);
-
-/*
- *  Machine dependent cyclic subsystem initialisation.
- */
-static void
-cyclic_machdep_init(void)
-{
-	/* Register the cyclic backend. */
-	cyclic_init(&be);
-}
-
-static void
-cyclic_machdep_uninit(void)
-{
-	int i;
-
-	for (i = 0; i <= mp_maxid; i++)
-		/* Reset the cyclic clock callback hook. */
-		lapic_cyclic_clock_func[i] = NULL;
-
-	/* De-register the cyclic backend. */
-	cyclic_uninit();
-}
-
-static hrtime_t exp_due[MAXCPU];
-
-/*
- * This function is the one registered by the machine dependent
- * initialiser as the callback for high speed timer events.
- */
-static void
-cyclic_clock(struct trapframe *frame)
-{
-	cpu_t *c = &solaris_cpu[curcpu];
-
-	if (c->cpu_cyclic != NULL && gethrtime() >= exp_due[curcpu]) {
-		if (TRAPF_USERMODE(frame)) {
-			c->cpu_profile_pc = 0;
-			c->cpu_profile_upc = TRAPF_PC(frame);
-		} else {
-			c->cpu_profile_pc = TRAPF_PC(frame);
-			c->cpu_profile_upc = 0;
-		}
-
-		c->cpu_intr_actv = 1;
-
-		/* Fire any timers that are due. */
-		cyclic_fire(c);
-
-		c->cpu_intr_actv = 0;
-	}
-}
-
-static void enable(cyb_arg_t arg)
-{
-	/* Register the cyclic clock callback function. */
-	lapic_cyclic_clock_func[curcpu] = cyclic_clock;
-}
-
-static void disable(cyb_arg_t arg)
-{
-	/* Reset the cyclic clock callback function. */
-	lapic_cyclic_clock_func[curcpu] = NULL;
-}
-
-static void reprogram(cyb_arg_t arg, hrtime_t exp)
-{
-	exp_due[curcpu] = exp;
-}
-
-static void xcall(cyb_arg_t arg, cpu_t *c, cyc_func_t func, void *param)
-{
-	/*
-	 * If the target CPU is the current one, just call the
-	 * function. This covers the non-SMP case.
-	 */
-	if (c == &solaris_cpu[curcpu])
-		(*func)(param);
-	else
-		smp_rendezvous_cpus((cpumask_t) (1 << c->cpuid), NULL,
-		    func, smp_no_rendevous_barrier, param);
-}
diff --git a/sys/modules/cyclic/Makefile b/sys/modules/cyclic/Makefile
index db99488..371dac6 100644
--- a/sys/modules/cyclic/Makefile
+++ b/sys/modules/cyclic/Makefile
@@ -10,7 +10,7 @@ SRCS+=		vnode_if.h
 CFLAGS+=	-I${.CURDIR}/../../cddl/compat/opensolaris		\
 		-I${.CURDIR}/../../cddl/contrib/opensolaris/uts/common	\
 		-I${.CURDIR}/../..					\
-		-I${.CURDIR}/../../cddl/dev/cyclic/${MACHINE_ARCH}
+		-I${.CURDIR}/../../cddl/dev/cyclic/${MACHINE_ARCH:S/amd64/i386/}
 
 CFLAGS+=	-DDEBUG=1