From 4c623367dfdcb425ddccf07630ea649fe6c14a4a Mon Sep 17 00:00:00 2001 From: phk Date: Thu, 13 Nov 2003 10:02:12 +0000 Subject: [PATCH] Don't disable the TSC with statclock_disable. --- sys/i386/isa/clock.c | 18 +++++++++--------- sys/isa/atrtc.c | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c index b38967049767..080c66c0d9cb 100644 --- a/sys/i386/isa/clock.c +++ b/sys/i386/isa/clock.c @@ -944,17 +944,17 @@ cpu_initclocks() writertc(RTC_STATUSB, RTCSB_24HR); /* Don't bother enabling the statistics clock. */ - if (statclock_disable) - return; - diag = rtcin(RTC_DIAG); - if (diag != 0) - printf("RTC BIOS diagnostic error %b\n", diag, RTCDG_BITS); + if (!statclock_disable) { + diag = rtcin(RTC_DIAG); + if (diag != 0) + printf("RTC BIOS diagnostic error %b\n", diag, RTCDG_BITS); - intr_add_handler("rtc", 8, (driver_intr_t *)rtcintr, NULL, - INTR_TYPE_CLK | INTR_FAST, NULL); - i8254_intsrc = intr_lookup_source(8); + intr_add_handler("rtc", 8, (driver_intr_t *)rtcintr, NULL, + INTR_TYPE_CLK | INTR_FAST, NULL); + i8254_intsrc = intr_lookup_source(8); - writertc(RTC_STATUSB, rtc_statusb); + writertc(RTC_STATUSB, rtc_statusb); + } init_TSC_tc(); } diff --git a/sys/isa/atrtc.c b/sys/isa/atrtc.c index b38967049767..080c66c0d9cb 100644 --- a/sys/isa/atrtc.c +++ b/sys/isa/atrtc.c @@ -944,17 +944,17 @@ cpu_initclocks() writertc(RTC_STATUSB, RTCSB_24HR); /* Don't bother enabling the statistics clock. */ - if (statclock_disable) - return; - diag = rtcin(RTC_DIAG); - if (diag != 0) - printf("RTC BIOS diagnostic error %b\n", diag, RTCDG_BITS); + if (!statclock_disable) { + diag = rtcin(RTC_DIAG); + if (diag != 0) + printf("RTC BIOS diagnostic error %b\n", diag, RTCDG_BITS); - intr_add_handler("rtc", 8, (driver_intr_t *)rtcintr, NULL, - INTR_TYPE_CLK | INTR_FAST, NULL); - i8254_intsrc = intr_lookup_source(8); + intr_add_handler("rtc", 8, (driver_intr_t *)rtcintr, NULL, + INTR_TYPE_CLK | INTR_FAST, NULL); + i8254_intsrc = intr_lookup_source(8); - writertc(RTC_STATUSB, rtc_statusb); + writertc(RTC_STATUSB, rtc_statusb); + } init_TSC_tc(); }