summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>1998-06-21 12:22:35 +0000
committerbde <bde@FreeBSD.org>1998-06-21 12:22:35 +0000
commit37526a29b05f18b34df589bd03b6227856b031d3 (patch)
tree2397a16a821c937a5c8a2d16bc221d35469891ea
parent7645c5747039df0ea1540e22d911a18e309eab8d (diff)
downloadFreeBSD-src-37526a29b05f18b34df589bd03b6227856b031d3.zip
FreeBSD-src-37526a29b05f18b34df589bd03b6227856b031d3.tar.gz
Round tickadj up. This prevents tickadj from being 0 when HZ > 500,
which makes adjtime(2) useless and confuses xntpd(8) into refusing to start even when it would use the kernel PLL instead of adjtime(). The result is the same as recommended by tickadj(8), at least when HZ divides 10^6. Of course, you wouldn't want to actually use adjtime() when HZ is large. In the silly boundary case of HZ == 10^6, tickadj == tick == 1 so the clock stops while adjtime() is active.
-rw-r--r--sys/conf/param.c4
-rw-r--r--sys/kern/subr_param.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/conf/param.c b/sys/conf/param.c
index b78a292..00d2484 100644
--- a/sys/conf/param.c
+++ b/sys/conf/param.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)param.c 8.3 (Berkeley) 8/20/94
- * $Id: param.c,v 1.26 1998/02/27 19:58:29 guido Exp $
+ * $Id: param.c,v 1.27 1998/05/15 20:10:54 wollman Exp $
*/
#include "opt_sysvipc.h"
@@ -70,7 +70,7 @@
#endif
int hz = HZ;
int tick = 1000000 / HZ;
-int tickadj = 30000 / (60 * HZ); /* can adjust 30ms in 60s */
+int tickadj = howmany(30000, 60 * HZ); /* can adjust 30ms in 60s */
#define NPROC (20 + 16 * MAXUSERS)
#define MAXFILES (NPROC*2)
int maxproc = NPROC; /* maximum # of processes */
diff --git a/sys/kern/subr_param.c b/sys/kern/subr_param.c
index b78a292..00d2484 100644
--- a/sys/kern/subr_param.c
+++ b/sys/kern/subr_param.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)param.c 8.3 (Berkeley) 8/20/94
- * $Id: param.c,v 1.26 1998/02/27 19:58:29 guido Exp $
+ * $Id: param.c,v 1.27 1998/05/15 20:10:54 wollman Exp $
*/
#include "opt_sysvipc.h"
@@ -70,7 +70,7 @@
#endif
int hz = HZ;
int tick = 1000000 / HZ;
-int tickadj = 30000 / (60 * HZ); /* can adjust 30ms in 60s */
+int tickadj = howmany(30000, 60 * HZ); /* can adjust 30ms in 60s */
#define NPROC (20 + 16 * MAXUSERS)
#define MAXFILES (NPROC*2)
int maxproc = NPROC; /* maximum # of processes */
OpenPOWER on IntegriCloud