From 7ae7963be308ce9d370e4532d505e53d18923687 Mon Sep 17 00:00:00 2001 From: phk Date: Tue, 9 Mar 1999 20:20:09 +0000 Subject: Make TIMER_FREQ a normal, undocumented option. Raise confusion to a higher level with example in LINT. Clarify comment about PPS_SYNC. Ignore for now that it doesn't work in FLL mode, it will in a few days. --- sys/amd64/amd64/trap.c | 3 ++- sys/conf/NOTES | 6 ++++-- sys/conf/options.i386 | 3 ++- sys/i386/conf/LINT | 6 ++++-- sys/i386/conf/NOTES | 6 ++++-- sys/i386/conf/options.i386 | 3 ++- sys/i386/i386/trap.c | 3 ++- sys/kern/subr_trap.c | 3 ++- 8 files changed, 22 insertions(+), 11 deletions(-) (limited to 'sys') diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index 42b0c85..4498e99 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $Id: trap.c,v 1.132 1998/12/28 23:02:56 msmith Exp $ + * $Id: trap.c,v 1.133 1999/01/06 23:05:36 julian Exp $ */ /* @@ -45,6 +45,7 @@ #include "opt_cpu.h" #include "opt_ddb.h" #include "opt_ktrace.h" +#include "opt_clock.h" #include "opt_trap.h" #include "opt_vm86.h" diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 26f9ef8..2c87356 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -2,7 +2,7 @@ # LINT -- config file for checking all the sources, tries to pull in # as much of the source tree as it can. # -# $Id: LINT,v 1.562 1999/03/04 09:53:19 sos Exp $ +# $Id: LINT,v 1.563 1999/03/09 00:24:27 brian Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -852,7 +852,7 @@ options "TUNE_1542" # Enable support for the kernel PLL to use an external PPS signal, # under supervision of [x]ntpd(8) -# More info in ftp://ftp.udel.edu/pub/ntp/kernel.tar.Z +# More info in ntpd documentation: http://www.eecis.udel.edu/~ntp options PPS_SYNC @@ -861,6 +861,7 @@ options PPS_SYNC # for too long. You can make the system more resistant to this by # choosing a high value for NTIMECOUNTER. The default is 5, there # is no upper limit but more than a couple of hundred are not productive. +# A better strategy may be to sysctl -w kern.timecounter.method=1 options "NTIMECOUNTER=20" @@ -1951,6 +1952,7 @@ options DEBUG_LOCKS options CLK_CALIBRATION_LOOP options "CLK_USE_I8254_CALIBRATION" options CLK_USE_TSC_CALIBRATION +options "TIMER_FREQ=((14318182+6)/12)" options CLUSTERDEBUG options COMPAT_LINUX options CPU_UPGRADE_HW_CACHE diff --git a/sys/conf/options.i386 b/sys/conf/options.i386 index 0fff375..031a5d6 100644 --- a/sys/conf/options.i386 +++ b/sys/conf/options.i386 @@ -1,4 +1,4 @@ -# $Id: options.i386,v 1.105 1999/03/03 10:40:24 kato Exp $ +# $Id: options.i386,v 1.106 1999/03/07 16:11:12 hm Exp $ DISABLE_PSE IDE_DELAY @@ -41,6 +41,7 @@ NINTR opt_smp.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 NO_F00F_HACK opt_cpu.h CPU_BLUELIGHTNING_FPU_OP_CACHE opt_cpu.h diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT index 26f9ef8..2c87356 100644 --- a/sys/i386/conf/LINT +++ b/sys/i386/conf/LINT @@ -2,7 +2,7 @@ # LINT -- config file for checking all the sources, tries to pull in # as much of the source tree as it can. # -# $Id: LINT,v 1.562 1999/03/04 09:53:19 sos Exp $ +# $Id: LINT,v 1.563 1999/03/09 00:24:27 brian Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -852,7 +852,7 @@ options "TUNE_1542" # Enable support for the kernel PLL to use an external PPS signal, # under supervision of [x]ntpd(8) -# More info in ftp://ftp.udel.edu/pub/ntp/kernel.tar.Z +# More info in ntpd documentation: http://www.eecis.udel.edu/~ntp options PPS_SYNC @@ -861,6 +861,7 @@ options PPS_SYNC # for too long. You can make the system more resistant to this by # choosing a high value for NTIMECOUNTER. The default is 5, there # is no upper limit but more than a couple of hundred are not productive. +# A better strategy may be to sysctl -w kern.timecounter.method=1 options "NTIMECOUNTER=20" @@ -1951,6 +1952,7 @@ options DEBUG_LOCKS options CLK_CALIBRATION_LOOP options "CLK_USE_I8254_CALIBRATION" options CLK_USE_TSC_CALIBRATION +options "TIMER_FREQ=((14318182+6)/12)" options CLUSTERDEBUG options COMPAT_LINUX options CPU_UPGRADE_HW_CACHE diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 26f9ef8..2c87356 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -2,7 +2,7 @@ # LINT -- config file for checking all the sources, tries to pull in # as much of the source tree as it can. # -# $Id: LINT,v 1.562 1999/03/04 09:53:19 sos Exp $ +# $Id: LINT,v 1.563 1999/03/09 00:24:27 brian Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -852,7 +852,7 @@ options "TUNE_1542" # Enable support for the kernel PLL to use an external PPS signal, # under supervision of [x]ntpd(8) -# More info in ftp://ftp.udel.edu/pub/ntp/kernel.tar.Z +# More info in ntpd documentation: http://www.eecis.udel.edu/~ntp options PPS_SYNC @@ -861,6 +861,7 @@ options PPS_SYNC # for too long. You can make the system more resistant to this by # choosing a high value for NTIMECOUNTER. The default is 5, there # is no upper limit but more than a couple of hundred are not productive. +# A better strategy may be to sysctl -w kern.timecounter.method=1 options "NTIMECOUNTER=20" @@ -1951,6 +1952,7 @@ options DEBUG_LOCKS options CLK_CALIBRATION_LOOP options "CLK_USE_I8254_CALIBRATION" options CLK_USE_TSC_CALIBRATION +options "TIMER_FREQ=((14318182+6)/12)" options CLUSTERDEBUG options COMPAT_LINUX options CPU_UPGRADE_HW_CACHE diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386 index 0fff375..031a5d6 100644 --- a/sys/i386/conf/options.i386 +++ b/sys/i386/conf/options.i386 @@ -1,4 +1,4 @@ -# $Id: options.i386,v 1.105 1999/03/03 10:40:24 kato Exp $ +# $Id: options.i386,v 1.106 1999/03/07 16:11:12 hm Exp $ DISABLE_PSE IDE_DELAY @@ -41,6 +41,7 @@ NINTR opt_smp.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 NO_F00F_HACK opt_cpu.h CPU_BLUELIGHTNING_FPU_OP_CACHE opt_cpu.h diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c index 42b0c85..4498e99 100644 --- a/sys/i386/i386/trap.c +++ b/sys/i386/i386/trap.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $Id: trap.c,v 1.132 1998/12/28 23:02:56 msmith Exp $ + * $Id: trap.c,v 1.133 1999/01/06 23:05:36 julian Exp $ */ /* @@ -45,6 +45,7 @@ #include "opt_cpu.h" #include "opt_ddb.h" #include "opt_ktrace.h" +#include "opt_clock.h" #include "opt_trap.h" #include "opt_vm86.h" diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c index 42b0c85..4498e99 100644 --- a/sys/kern/subr_trap.c +++ b/sys/kern/subr_trap.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $Id: trap.c,v 1.132 1998/12/28 23:02:56 msmith Exp $ + * $Id: trap.c,v 1.133 1999/01/06 23:05:36 julian Exp $ */ /* @@ -45,6 +45,7 @@ #include "opt_cpu.h" #include "opt_ddb.h" #include "opt_ktrace.h" +#include "opt_clock.h" #include "opt_trap.h" #include "opt_vm86.h" -- cgit v1.1