diff options
| author | Rui Paulo <rpaulo@FreeBSD.org> | 2010-04-20 17:03:30 +0000 |
|---|---|---|
| committer | Rui Paulo <rpaulo@FreeBSD.org> | 2010-04-20 17:03:30 +0000 |
| commit | ff569d8436052b01c102a791ff60caf4a05b0319 (patch) | |
| tree | 835e71eee941c612c669dff434907e4aea3d4e0c | |
| parent | b527a2a4dc2a83b4da9a2b2fa6cdc6db4733da12 (diff) | |
| download | src-ff569d8436052b01c102a791ff60caf4a05b0319.tar.gz src-ff569d8436052b01c102a791ff60caf4a05b0319.zip | |
Notes
| -rw-r--r-- | sys/amd64/amd64/local_apic.c | 6 | ||||
| -rw-r--r-- | sys/cddl/dev/cyclic/i386/cyclic_machdep.c | 6 | ||||
| -rw-r--r-- | sys/i386/i386/local_apic.c | 6 | ||||
| -rw-r--r-- | sys/sys/dtrace_bsd.h | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/sys/amd64/amd64/local_apic.c b/sys/amd64/amd64/local_apic.c index 8edc971c95cf..c8f60f066759 100644 --- a/sys/amd64/amd64/local_apic.c +++ b/sys/amd64/amd64/local_apic.c @@ -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 *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 /* Fire hardclock at hz. */ diff --git a/sys/cddl/dev/cyclic/i386/cyclic_machdep.c b/sys/cddl/dev/cyclic/i386/cyclic_machdep.c index fa40db9329c1..0b6ab5936e2c 100644 --- a/sys/cddl/dev/cyclic/i386/cyclic_machdep.c +++ b/sys/cddl/dev/cyclic/i386/cyclic_machdep.c @@ -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) diff --git a/sys/i386/i386/local_apic.c b/sys/i386/i386/local_apic.c index 302535f27f94..d894d3271d01 100644 --- a/sys/i386/i386/local_apic.c +++ b/sys/i386/i386/local_apic.c @@ -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 *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 /* Fire hardclock at hz. */ diff --git a/sys/sys/dtrace_bsd.h b/sys/sys/dtrace_bsd.h index f3232841fa0e..a14a1a160f37 100644 --- a/sys/sys/dtrace_bsd.h +++ b/sys/sys/dtrace_bsd.h @@ -50,7 +50,7 @@ typedef void (*cyclic_clock_func_t)(struct trapframe *); * * 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. |