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

Fixed style bugs in clock.c rev.1.164 and cpu.h rev.1.52-1.53 -- declare

Browse Source 
tsc_present in the right places (together with other variables of the
same linkage), and don't use messy ifdefs just to avoid exporting it in
some cases.
This commit is contained in:
Bruce Evans 2001-02-19 03:00:34 +00:00
parent 6edba32695
commit 12a586bbda
7 changed files with 7 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -139,6 +139,7 @@ u_int timer_freq = TIMER_FREQ;
int timer0_max_count;
u_int tsc_freq;
int tsc_is_broken;
u_int tsc_present;
int wall_cmos_clock; /* wall CMOS clock assumed if != 0 */
struct mtx clock_lock;
@ -169,12 +170,6 @@ 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

@ -105,13 +105,10 @@
#ifdef _KERNEL
extern char btext[];
extern char etext[];
extern u_int tsc_present;
void fork_trampoline __P((void));
#if defined(I386_CPU) || defined(I486_CPU)
extern u_int tsc_present;
#endif
/*
* Return contents of in-cpu fast counter as a sort of "bogo-time"
* for non-critical timing.

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

@ -139,6 +139,7 @@ u_int timer_freq = TIMER_FREQ;
int timer0_max_count;
u_int tsc_freq;
int tsc_is_broken;
u_int tsc_present;
int wall_cmos_clock; /* wall CMOS clock assumed if != 0 */
struct mtx clock_lock;
@ -169,12 +170,6 @@ 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));

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

@ -139,6 +139,7 @@ u_int timer_freq = TIMER_FREQ;
int timer0_max_count;
u_int tsc_freq;
int tsc_is_broken;
u_int tsc_present;
int wall_cmos_clock; /* wall CMOS clock assumed if != 0 */
struct mtx clock_lock;
@ -169,12 +170,6 @@ 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

@ -105,13 +105,10 @@
#ifdef _KERNEL
extern char btext[];
extern char etext[];
extern u_int tsc_present;
void fork_trampoline __P((void));
#if defined(I386_CPU) || defined(I486_CPU)
extern u_int tsc_present;
#endif
/*
* Return contents of in-cpu fast counter as a sort of "bogo-time"
* for non-critical timing.

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

@ -139,6 +139,7 @@ u_int timer_freq = TIMER_FREQ;
int timer0_max_count;
u_int tsc_freq;
int tsc_is_broken;
u_int tsc_present;
int wall_cmos_clock; /* wall CMOS clock assumed if != 0 */
struct mtx clock_lock;
@ -169,12 +170,6 @@ 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));

7
sys/isa/atrtc.c
View File

@ -139,6 +139,7 @@ u_int timer_freq = TIMER_FREQ;
int timer0_max_count;
u_int tsc_freq;
int tsc_is_broken;
u_int tsc_present;
int wall_cmos_clock; /* wall CMOS clock assumed if != 0 */
struct mtx clock_lock;
@ -169,12 +170,6 @@ 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));