diff options
| author | phk <phk@FreeBSD.org> | 1997-12-28 13:36:09 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 1997-12-28 13:36:09 +0000 |
| commit | ca105236ff16f62ac2fdcdd9591281b1a4d2995f (patch) | |
| tree | 6ef7a59affea2db05634530fff8d7f79080cf6d2 /sys/i386/isa/clock.c | |
| parent | 2608f479cc82a1ffcbd0cec5334d4d4c24a9c0a7 (diff) | |
| download | FreeBSD-src-ca105236ff16f62ac2fdcdd9591281b1a4d2995f.zip FreeBSD-src-ca105236ff16f62ac2fdcdd9591281b1a4d2995f.tar.gz | |
wash, sort and put in order various nits from the i586_ctr -> tsc
commit.
Pointed out by: bde
Diffstat (limited to 'sys/i386/isa/clock.c')
| -rw-r--r-- | sys/i386/isa/clock.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c index 8b94ff8..b7b1289 100644 --- a/sys/i386/isa/clock.c +++ b/sys/i386/isa/clock.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.104 1997/11/18 11:16:56 bde Exp $ + * $Id: clock.c,v 1.105 1997/12/26 20:42:05 phk Exp $ */ /* @@ -116,16 +116,6 @@ int adjkerntz; /* local offset from GMT in seconds */ int disable_rtc_set; /* disable resettodr() if != 0 */ u_int idelayed; -#if defined(I586_CPU) || defined(I686_CPU) -#ifndef SMP -u_int tsc_bias; -u_int tsc_comultiplier; -#endif -u_int tsc_freq; -#ifndef SMP -u_int tsc_multiplier; -#endif -#endif int statclock_disable; u_int stat_imask = SWI_CLOCK_MASK; #ifdef TIMER_FREQ @@ -136,6 +126,16 @@ u_int timer_freq = 1193182; int timer0_max_count; u_int timer0_overflow_threshold; u_int timer0_prescaler_count; +#if defined(I586_CPU) || defined(I686_CPU) +#ifndef SMP +u_int tsc_bias; +u_int tsc_comultiplier; +#endif +u_int tsc_freq; +#ifndef SMP +u_int tsc_multiplier; +#endif +#endif int wall_cmos_clock; /* wall CMOS clock assumed if != 0 */ static int beeping = 0; |
