svn commit: r206901 - in head/sys: amd64/amd64 cddl/dev/cyclic/i386 i386/i386 sys

[Bjoern A. Zeeb]

On Tue, 20 Apr 2010, Rui Paulo wrote:

> Author: rpaulo
> Date: Tue Apr 20 17:03:30 2010
> New Revision: 206901
> URL: http://svn.freebsd.org/changeset/base/206901
>
> Log:
>  Rename the cyclic global variable lapic_cyclic_clock_func to just
>  cyclic_clock_func. This will make more sense when we start developing non
>  x86 cyclic version.

I think this is the cause for LINT.386 failing with:

  87 /scratch/tmp/bz/HEAD.svn/sys/x86/isa/clock.c: In function 'clkintr':
  88 /scratch/tmp/bz/HEAD.svn/sys/x86/isa/clock.c:189: error: 'lapic_cyclic_clock_func' undeclared (first use in this function)
  89 /scratch/tmp/bz/HEAD.svn/sys/x86/isa/clock.c:189: error: (Each undeclared identifier is reported only once
  90 /scratch/tmp/bz/HEAD.svn/sys/x86/isa/clock.c:189: error: for each function it appears in.)



> Modified:
>  head/sys/amd64/amd64/local_apic.c
>  head/sys/cddl/dev/cyclic/i386/cyclic_machdep.c
>  head/sys/i386/i386/local_apic.c
>  head/sys/sys/dtrace_bsd.h
>
> Modified: head/sys/amd64/amd64/local_apic.c
> ==============================================================================
> --- head/sys/amd64/amd64/local_apic.c	Tue Apr 20 16:30:17 2010	(r206900)
> +++ head/sys/amd64/amd64/local_apic.c	Tue Apr 20 17:03:30 2010	(r206901)
> @@ -70,7 +70,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. */
> @@ -778,8 +778,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: head/sys/cddl/dev/cyclic/i386/cyclic_machdep.c
> ==============================================================================
> --- head/sys/cddl/dev/cyclic/i386/cyclic_machdep.c	Tue Apr 20 16:30:17 2010	(r206900)
> +++ head/sys/cddl/dev/cyclic/i386/cyclic_machdep.c	Tue Apr 20 17:03:30 2010	(r206901)
> @@ -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: head/sys/i386/i386/local_apic.c
> ==============================================================================
> --- head/sys/i386/i386/local_apic.c	Tue Apr 20 16:30:17 2010	(r206900)
> +++ head/sys/i386/i386/local_apic.c	Tue Apr 20 17:03:30 2010	(r206901)
> @@ -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. */
> @@ -779,8 +779,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: head/sys/sys/dtrace_bsd.h
> ==============================================================================
> --- head/sys/sys/dtrace_bsd.h	Tue Apr 20 16:30:17 2010	(r206900)
> +++ head/sys/sys/dtrace_bsd.h	Tue Apr 20 17:03:30 2010	(r206901)
> @@ -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.
>

-- 
Bjoern A. Zeeb         It will not break if you know what you are doing.