diff options
| -rw-r--r-- | sys/kern/init_main.c | 11 | ||||
| -rw-r--r-- | sys/kern/sched_bsd.c | 4 |
2 files changed, 3 insertions, 12 deletions
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index 3a919105aa9..9de115cb56c 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: init_main.c,v 1.245 2015/10/07 10:50:35 mpi Exp $ */ +/* $OpenBSD: init_main.c,v 1.246 2015/11/08 20:45:57 naddy Exp $ */ /* $NetBSD: init_main.c,v 1.84.4.1 1996/06/02 09:08:06 mrg Exp $ */ /* @@ -118,11 +118,6 @@ struct sigacts sigacts0; struct process *initprocess; struct proc *reaperproc; -#ifndef SMALL_KERNEL -extern struct timeout setperf_to; -void setperf_auto(void *); -#endif - extern struct user *proc0paddr; struct vnode *rootvp, *swapdev_vp; @@ -549,10 +544,6 @@ main(void *framep) start_init_exec = 1; wakeup((void *)&start_init_exec); -#ifndef SMALL_KERNEL - timeout_set(&setperf_to, setperf_auto, NULL); -#endif - /* * Start the idle pool page garbage collector */ diff --git a/sys/kern/sched_bsd.c b/sys/kern/sched_bsd.c index abd92fd4b8d..33db9c73d01 100644 --- a/sys/kern/sched_bsd.c +++ b/sys/kern/sched_bsd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sched_bsd.c,v 1.41 2015/03/14 03:38:50 jsg Exp $ */ +/* $OpenBSD: sched_bsd.c,v 1.42 2015/11/08 20:45:57 naddy Exp $ */ /* $NetBSD: kern_synch.c,v 1.37 1996/04/22 01:38:37 christos Exp $ */ /*- @@ -578,8 +578,8 @@ int perfpolicy = PERFPOL_MANUAL; */ #include <sys/sysctl.h> -struct timeout setperf_to; void setperf_auto(void *); +struct timeout setperf_to = TIMEOUT_INITIALIZER(setperf_auto, NULL); void setperf_auto(void *v) |