d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Namespace cleanup. Remove some #includes in favour of an explicit

Browse Source 
declaration.

Asked for by:	bde
This commit is contained in:
Mark Murray 2000-12-02 17:59:41 +00:00
parent 4cb1e53914
commit 4a3a2f0704
7 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/amd64/amd64/tsc.c
View File

@ -169,7 +169,12 @@ static u_int timer0_prescaler_count;
static u_char timer0_state;
static u_char timer2_state;
static void (*timer_func) __P((struct clockframe *frame)) = hardclock;
#if defined(I386_CPU) || defined(I486_CPU)
u_int tsc_present; /* Not static; other parts of the kernel
* Need to know this */
#else
static u_int tsc_present;
#endif
static unsigned i8254_get_timecount __P((struct timecounter *tc));
static unsigned tsc_get_timecount __P((struct timecounter *tc));

5
sys/amd64/include/cpu.h
View File

@ -47,8 +47,6 @@
#include <machine/frame.h>
#include <machine/segments.h>
#include <machine/globals.h>
#include <machine/md_var.h>
#include <machine/specialreg.h>
/*
* definitions of cpu-dependent requirements
@ -145,9 +143,10 @@ static __inline u_int64_t
get_cyclecount(void)
{
#if defined(I386_CPU) || defined(I486_CPU)
extern u_int tsc_present;
struct timespec tv;
if ((cpu_feature & CPUID_TSC) == 0) {
if (!tsc_present) {
nanotime(&tv);
return (tv.tv_sec * (u_int64_t)1000000000 + tv.tv_nsec);
}

5
sys/amd64/isa/clock.c
View File

@ -169,7 +169,12 @@ static u_int timer0_prescaler_count;
static u_char timer0_state;
static u_char timer2_state;
static void (*timer_func) __P((struct clockframe *frame)) = hardclock;
#if defined(I386_CPU) || defined(I486_CPU)
u_int tsc_present; /* Not static; other parts of the kernel
* Need to know this */
#else
static u_int tsc_present;
#endif
static unsigned i8254_get_timecount __P((struct timecounter *tc));
static unsigned tsc_get_timecount __P((struct timecounter *tc));

5
sys/i386/i386/tsc.c
View File

@ -169,7 +169,12 @@ static u_int timer0_prescaler_count;
static u_char timer0_state;
static u_char timer2_state;
static void (*timer_func) __P((struct clockframe *frame)) = hardclock;
#if defined(I386_CPU) || defined(I486_CPU)
u_int tsc_present; /* Not static; other parts of the kernel
* Need to know this */
#else
static u_int tsc_present;
#endif
static unsigned i8254_get_timecount __P((struct timecounter *tc));
static unsigned tsc_get_timecount __P((struct timecounter *tc));

5
sys/i386/include/cpu.h
View File

@ -47,8 +47,6 @@
#include <machine/frame.h>
#include <machine/segments.h>
#include <machine/globals.h>
#include <machine/md_var.h>
#include <machine/specialreg.h>
/*
* definitions of cpu-dependent requirements
@ -145,9 +143,10 @@ static __inline u_int64_t
get_cyclecount(void)
{
#if defined(I386_CPU) || defined(I486_CPU)
extern u_int tsc_present;
struct timespec tv;
if ((cpu_feature & CPUID_TSC) == 0) {
if (!tsc_present) {
nanotime(&tv);
return (tv.tv_sec * (u_int64_t)1000000000 + tv.tv_nsec);
}

5
sys/i386/isa/clock.c
View File

@ -169,7 +169,12 @@ static u_int timer0_prescaler_count;
static u_char timer0_state;
static u_char timer2_state;
static void (*timer_func) __P((struct clockframe *frame)) = hardclock;
#if defined(I386_CPU) || defined(I486_CPU)
u_int tsc_present; /* Not static; other parts of the kernel
* Need to know this */
#else
static u_int tsc_present;
#endif
static unsigned i8254_get_timecount __P((struct timecounter *tc));
static unsigned tsc_get_timecount __P((struct timecounter *tc));

5
sys/isa/atrtc.c
View File

@ -169,7 +169,12 @@ static u_int timer0_prescaler_count;
static u_char timer0_state;
static u_char timer2_state;
static void (*timer_func) __P((struct clockframe *frame)) = hardclock;
#if defined(I386_CPU) || defined(I486_CPU)
u_int tsc_present; /* Not static; other parts of the kernel
* Need to know this */
#else
static u_int tsc_present;
#endif
static unsigned i8254_get_timecount __P((struct timecounter *tc));
static unsigned tsc_get_timecount __P((struct timecounter *tc));