summaryrefslogtreecommitdiffstats
path: root/sys/pc98
diff options
context:
space:
mode:
authorkato <kato@FreeBSD.org>2001-02-21 10:22:22 +0000
committerkato <kato@FreeBSD.org>2001-02-21 10:22:22 +0000
commit06313a166f031ca70ce9bd79a7fccac79a1c673e (patch)
tree0e8070cc2113d2a075d0671dbefe7d1c2169b9db /sys/pc98
parent47d923c34a2fec8907cd6a660eac68274c43c868 (diff)
downloadFreeBSD-src-06313a166f031ca70ce9bd79a7fccac79a1c673e.zip
FreeBSD-src-06313a166f031ca70ce9bd79a7fccac79a1c673e.tar.gz
Merged from sys/i386/isa/clock.c revision 1.170.
Diffstat (limited to 'sys/pc98')
-rw-r--r--sys/pc98/cbus/clock.c7
-rw-r--r--sys/pc98/cbus/pcrtc.c7
-rw-r--r--sys/pc98/pc98/clock.c7
3 files changed, 3 insertions, 18 deletions
diff --git a/sys/pc98/cbus/clock.c b/sys/pc98/cbus/clock.c
index dd1efd5..8c2cb4b 100644
--- a/sys/pc98/cbus/clock.c
+++ b/sys/pc98/cbus/clock.c
@@ -153,6 +153,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;
@@ -194,12 +195,6 @@ static void rtc_serialcom __P((int));
static int rtc_inb __P((void));
static void rtc_outb __P((int));
#endif
-#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));
diff --git a/sys/pc98/cbus/pcrtc.c b/sys/pc98/cbus/pcrtc.c
index dd1efd5..8c2cb4b 100644
--- a/sys/pc98/cbus/pcrtc.c
+++ b/sys/pc98/cbus/pcrtc.c
@@ -153,6 +153,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;
@@ -194,12 +195,6 @@ static void rtc_serialcom __P((int));
static int rtc_inb __P((void));
static void rtc_outb __P((int));
#endif
-#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));
diff --git a/sys/pc98/pc98/clock.c b/sys/pc98/pc98/clock.c
index dd1efd5..8c2cb4b 100644
--- a/sys/pc98/pc98/clock.c
+++ b/sys/pc98/pc98/clock.c
@@ -153,6 +153,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;
@@ -194,12 +195,6 @@ static void rtc_serialcom __P((int));
static int rtc_inb __P((void));
static void rtc_outb __P((int));
#endif
-#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));
OpenPOWER on IntegriCloud