diff options
| author | Masao Uebayashi <uebayasi@cvs.openbsd.org> | 2015-07-20 23:47:21 +0000 |
|---|---|---|
| committer | Masao Uebayashi <uebayasi@cvs.openbsd.org> | 2015-07-20 23:47:21 +0000 |
| commit | 484a61a40f69196a63b292c3c497a1d536571ef7 (patch) | |
| tree | 146a2b57512ad14fbd18436090364c253ca69e20 /sys | |
| parent | 6b8aadbd6449454477a1492e79acfdfface84215 (diff) | |
Move `ticks' declaration to sys/kernel.h.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/kern/kern_timeout.c | 3 | ||||
| -rw-r--r-- | sys/kern/subr_pool.c | 4 | ||||
| -rw-r--r-- | sys/sys/kernel.h | 3 |
3 files changed, 4 insertions, 6 deletions
diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c index e4a943fbc7f..fafd2105f0b 100644 --- a/sys/kern/kern_timeout.c +++ b/sys/kern/kern_timeout.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_timeout.c,v 1.42 2015/03/14 03:38:50 jsg Exp $ */ +/* $OpenBSD: kern_timeout.c,v 1.43 2015/07/20 23:47:20 uebayasi Exp $ */ /* * Copyright (c) 2001 Thomas Nordin <nordin@openbsd.org> * Copyright (c) 2000-2001 Artur Grabowski <art@openbsd.org> @@ -140,7 +140,6 @@ struct mutex timeout_mutex = MUTEX_INITIALIZER(IPL_HIGH); * "to->to_time - ticks". The result will always be positive for future * timeouts and 0 or negative for due timeouts. */ -extern int ticks; /* XXX - move to sys/X.h */ void timeout_startup(void) diff --git a/sys/kern/subr_pool.c b/sys/kern/subr_pool.c index 3c3f85e0477..b154c3238c7 100644 --- a/sys/kern/subr_pool.c +++ b/sys/kern/subr_pool.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_pool.c,v 1.185 2015/04/21 13:15:54 dlg Exp $ */ +/* $OpenBSD: subr_pool.c,v 1.186 2015/07/20 23:47:20 uebayasi Exp $ */ /* $NetBSD: subr_pool.c,v 1.61 2001/09/26 07:14:56 chs Exp $ */ /*- @@ -639,7 +639,6 @@ pool_put(struct pool *pp, void *v) { struct pool_item *pi = v; struct pool_item_header *ph, *freeph = NULL; - extern int ticks; #ifdef DIAGNOSTIC if (v == NULL) @@ -1368,7 +1367,6 @@ pool_gc_sched(void *null) void pool_gc_pages(void *null) { - extern int ticks; struct pool *pp; struct pool_item_header *ph, *freeph; int s; diff --git a/sys/sys/kernel.h b/sys/sys/kernel.h index 292c4f82b39..0aa5babd4d4 100644 --- a/sys/sys/kernel.h +++ b/sys/sys/kernel.h @@ -1,4 +1,4 @@ -/* $OpenBSD: kernel.h,v 1.16 2014/01/30 21:01:59 kettenis Exp $ */ +/* $OpenBSD: kernel.h,v 1.17 2015/07/20 23:47:20 uebayasi Exp $ */ /* $NetBSD: kernel.h,v 1.11 1995/03/03 01:24:16 cgd Exp $ */ /*- @@ -54,6 +54,7 @@ extern int tick; /* usec per tick (1000000 / hz) */ extern int tickfix; /* periodic tick adj. tick not integral */ extern int tickfixinterval; /* interval at which to apply adjustment */ extern int tickadj; /* "standard" clock skew, us./tick */ +extern int ticks; /* # of hardclock ticks */ extern int hz; /* system clock's frequency */ extern int stathz; /* statistics clock's frequency */ extern int profhz; /* profiling clock's frequency */ |