diff options
| author | bde <bde@FreeBSD.org> | 2003-12-30 07:28:54 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 2003-12-30 07:28:54 +0000 |
| commit | d456b60ff22f1ff1ce7e539cd7efdd1bcec94f0d (patch) | |
| tree | b1b8aa15dbc638ce57f6b7943b7818c74acf3970 | |
| parent | 1838491a763ea7d07f6a62a7e3c49c64187a20c3 (diff) | |
| download | FreeBSD-src-d456b60ff22f1ff1ce7e539cd7efdd1bcec94f0d.zip FreeBSD-src-d456b60ff22f1ff1ce7e539cd7efdd1bcec94f0d.tar.gz | |
Garbage-collected CLK_USE_TSC_CALIBRATION.
i386/conf/NOTES, pc98/conf/NOTES:
Fixed the descriptions of the other CLK_* options.
| -rw-r--r-- | sys/conf/options.i386 | 1 | ||||
| -rw-r--r-- | sys/conf/options.pc98 | 1 | ||||
| -rw-r--r-- | sys/i386/conf/NOTES | 13 | ||||
| -rw-r--r-- | sys/pc98/conf/NOTES | 13 |
4 files changed, 12 insertions, 16 deletions
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386 index c76983d..4091542 100644 --- a/sys/conf/options.i386 +++ b/sys/conf/options.i386 @@ -36,7 +36,6 @@ PAE opt_global.h CLK_CALIBRATION_LOOP opt_clock.h CLK_USE_I8254_CALIBRATION opt_clock.h -CLK_USE_TSC_CALIBRATION opt_clock.h TIMER_FREQ opt_clock.h CPU_ATHLON_SSE_HACK opt_cpu.h diff --git a/sys/conf/options.pc98 b/sys/conf/options.pc98 index 4b07bc0..413f12e 100644 --- a/sys/conf/options.pc98 +++ b/sys/conf/options.pc98 @@ -33,7 +33,6 @@ KVA_PAGES opt_global.h CLK_CALIBRATION_LOOP opt_clock.h CLK_USE_I8254_CALIBRATION opt_clock.h -CLK_USE_TSC_CALIBRATION opt_clock.h TIMER_FREQ opt_clock.h CPU_BLUELIGHTNING_3X opt_cpu.h diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 3f7e97a..3c3258a 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -238,17 +238,16 @@ options DEVICE_POLLING # The following options are used for debugging clock behavior only, and # should not be used for production systems. -# -# CLK_CALIBRATION_LOOP will run the clock calibration loop at startup -# until the user presses a key. +# CLK_CALIBRATION_LOOP causes clock calibration to be run in a loop at +# startup until the user presses a key. (The i8254 clock is always +# calibrated relative to the RTC (mc146818a) and this option causes the +# calibration to be repeated.) options CLK_CALIBRATION_LOOP -# The following two options measure the frequency of the corresponding -# clock relative to the RTC (onboard mc146818a). - +# CLK_USE_I8254_CALIBRATION causes the calibrated frequency of the i8254 +# clock to actually be used. options CLK_USE_I8254_CALIBRATION -options CLK_USE_TSC_CALIBRATION ##################################################################### diff --git a/sys/pc98/conf/NOTES b/sys/pc98/conf/NOTES index 819d46e..51b74ee 100644 --- a/sys/pc98/conf/NOTES +++ b/sys/pc98/conf/NOTES @@ -212,17 +212,16 @@ options DEVICE_POLLING # The following options are used for debugging clock behavior only, and # should not be used for production systems. -# -# CLK_CALIBRATION_LOOP will run the clock calibration loop at startup -# until the user presses a key. +# CLK_CALIBRATION_LOOP causes clock calibration to be run in a loop at +# startup until the user presses a key. (The i8254 clock is always +# calibrated relative to the RTC (mc146818a) and this option causes the +# calibration to be repeated.) options CLK_CALIBRATION_LOOP -# The following two options measure the frequency of the corresponding -# clock relative to the RTC (onboard mc146818a). - +# CLK_USE_I8254_CALIBRATION causes the calibrated frequency of the i8254 +# clock to actually be used. options CLK_USE_I8254_CALIBRATION -options CLK_USE_TSC_CALIBRATION ##################################################################### |
