svn commit: r215037 - in stable/8/sys: amd64/amd64 cddl/dev/cyclic/amd64 cddl/dev/cyclic/i386 i386/i386 modules/cyclic pc98/cbus sys x86/isa

[Alexander Motin]

Author: mav
Date: Tue Nov  9 14:53:49 2010
New Revision: 215037
URL: http://svn.freebsd.org/changeset/base/215037

Log:
  MFC r206900,r206901,r206922,r206993 by rpaulo:
  Rename the cyclic global variable lapic_cyclic_clock_func to just
  cyclic_clock_func.

Deleted:
  stable/8/sys/cddl/dev/cyclic/amd64/
Modified:
  stable/8/sys/amd64/amd64/local_apic.c
  stable/8/sys/cddl/dev/cyclic/i386/cyclic_machdep.c
  stable/8/sys/i386/i386/local_apic.c
  stable/8/sys/modules/cyclic/Makefile
  stable/8/sys/pc98/cbus/clock.c
  stable/8/sys/sys/dtrace_bsd.h
  stable/8/sys/x86/isa/clock.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/amd64/amd64/local_apic.c
==============================================================================
--- stable/8/sys/amd64/amd64/local_apic.c	Tue Nov  9 13:39:17 2010	(r215036)
+++ stable/8/sys/amd64/amd64/local_apic.c	Tue Nov  9 14:53:49 2010	(r215037)
@@ -71,7 +71,7 @@ __FBSDID("$FreeBSD$");
 
 #ifdef KDTRACE_HOOKS
 #include <sys/dtrace_bsd.h>
-cyclic_clock_func_t	lapic_cyclic_clock_func[MAXCPU];
+cyclic_clock_func_t	cyclic_clock_func[MAXCPU];
 #endif
 
 /* Sanity checks on IDT vectors. */
@@ -788,8 +788,8 @@ lapic_handle_timer(struct trapframe *fra
 	 * timers.
 	 */
 	int cpu = PCPU_GET(cpuid);
-	if (lapic_cyclic_clock_func[cpu] != NULL)
-		(*lapic_cyclic_clock_func[cpu])(frame);
+	if (cyclic_clock_func[cpu] != NULL)
+		(*cyclic_clock_func[cpu])(frame);
 #endif
 
 	/* Fire hardclock at hz. */

Modified: stable/8/sys/cddl/dev/cyclic/i386/cyclic_machdep.c
==============================================================================
--- stable/8/sys/cddl/dev/cyclic/i386/cyclic_machdep.c	Tue Nov  9 13:39:17 2010	(r215036)
+++ stable/8/sys/cddl/dev/cyclic/i386/cyclic_machdep.c	Tue Nov  9 14:53:49 2010	(r215037)
@@ -67,7 +67,7 @@ cyclic_machdep_uninit(void)
 
 	for (i = 0; i <= mp_maxid; i++)
 		/* Reset the cyclic clock callback hook. */
-		lapic_cyclic_clock_func[i] = NULL;
+		cyclic_clock_func[i] = NULL;
 
 	/* De-register the cyclic backend. */
 	cyclic_uninit();
@@ -105,13 +105,13 @@ cyclic_clock(struct trapframe *frame)
 static void enable(cyb_arg_t arg)
 {
 	/* Register the cyclic clock callback function. */
-	lapic_cyclic_clock_func[curcpu] = cyclic_clock;
+	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;
+	cyclic_clock_func[curcpu] = NULL;
 }
 
 static void reprogram(cyb_arg_t arg, hrtime_t exp)

Modified: stable/8/sys/i386/i386/local_apic.c
==============================================================================
--- stable/8/sys/i386/i386/local_apic.c	Tue Nov  9 13:39:17 2010	(r215036)
+++ stable/8/sys/i386/i386/local_apic.c	Tue Nov  9 14:53:49 2010	(r215037)
@@ -72,7 +72,7 @@ __FBSDID("$FreeBSD$");
 
 #ifdef KDTRACE_HOOKS
 #include <sys/dtrace_bsd.h>
-cyclic_clock_func_t	lapic_cyclic_clock_func[MAXCPU];
+cyclic_clock_func_t	cyclic_clock_func[MAXCPU];
 #endif
 
 /* Sanity checks on IDT vectors. */
@@ -790,8 +790,8 @@ lapic_handle_timer(struct trapframe *fra
 	 * timers.
 	 */
 	int cpu = PCPU_GET(cpuid);
-	if (lapic_cyclic_clock_func[cpu] != NULL)
-		(*lapic_cyclic_clock_func[cpu])(frame);
+	if (cyclic_clock_func[cpu] != NULL)
+		(*cyclic_clock_func[cpu])(frame);
 #endif
 
 	/* Fire hardclock at hz. */

Modified: stable/8/sys/modules/cyclic/Makefile
==============================================================================
--- stable/8/sys/modules/cyclic/Makefile	Tue Nov  9 13:39:17 2010	(r215036)
+++ stable/8/sys/modules/cyclic/Makefile	Tue Nov  9 14:53:49 2010	(r215037)
@@ -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
 

Modified: stable/8/sys/pc98/cbus/clock.c
==============================================================================
--- stable/8/sys/pc98/cbus/clock.c	Tue Nov  9 13:39:17 2010	(r215036)
+++ stable/8/sys/pc98/cbus/clock.c	Tue Nov  9 14:53:49 2010	(r215037)
@@ -175,8 +175,8 @@ clkintr(struct trapframe *frame)
 	 * timers.
 	 */
 	int cpu = PCPU_GET(cpuid);
-	if (lapic_cyclic_clock_func[cpu] != NULL)
-		(*lapic_cyclic_clock_func[cpu])(frame);
+	if (cyclic_clock_func[cpu] != NULL)
+		(*cyclic_clock_func[cpu])(frame);
 #endif
 
 #ifdef SMP

Modified: stable/8/sys/sys/dtrace_bsd.h
==============================================================================
--- stable/8/sys/sys/dtrace_bsd.h	Tue Nov  9 13:39:17 2010	(r215036)
+++ stable/8/sys/sys/dtrace_bsd.h	Tue Nov  9 14:53:49 2010	(r215037)
@@ -50,7 +50,7 @@ typedef	void (*cyclic_clock_func_t)(stru
  *
  * Defining them here avoids a proliferation of header files.
  */
-extern cyclic_clock_func_t     lapic_cyclic_clock_func[];
+extern cyclic_clock_func_t     cyclic_clock_func[];
 
 /*
  * The dtrace module handles traps that occur during a DTrace probe.

Modified: stable/8/sys/x86/isa/clock.c
==============================================================================
--- stable/8/sys/x86/isa/clock.c	Tue Nov  9 13:39:17 2010	(r215036)
+++ stable/8/sys/x86/isa/clock.c	Tue Nov  9 14:53:49 2010	(r215037)
@@ -186,8 +186,8 @@ clkintr(struct trapframe *frame)
 	 * timers.
 	 */
 	int cpu = PCPU_GET(cpuid);
-	if (lapic_cyclic_clock_func[cpu] != NULL)
-		(*lapic_cyclic_clock_func[cpu])(frame);
+	if (cyclic_clock_func[cpu] != NULL)
+		(*cyclic_clock_func[cpu])(frame);
 #endif
 
 	if (using_atrtc_timer) {