diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/kern/kern_clock.c | 4 | ||||
| -rw-r--r-- | sys/kern/kern_sysctl.c | 4 | ||||
| -rw-r--r-- | sys/sys/dkstat.h | 4 |
3 files changed, 4 insertions, 8 deletions
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c index 62a95b4fa42..6559b1615ab 100644 --- a/sys/kern/kern_clock.c +++ b/sys/kern/kern_clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_clock.c,v 1.85 2014/07/08 17:19:25 deraadt Exp $ */ +/* $OpenBSD: kern_clock.c,v 1.86 2014/09/04 19:14:47 miod Exp $ */ /* $NetBSD: kern_clock.c,v 1.34 1996/06/09 04:51:03 briggs Exp $ */ /*- @@ -102,8 +102,6 @@ int ticks; static int psdiv, pscnt; /* prof => stat divider */ int psratio; /* ratio: prof / stat */ -long cp_time[CPUSTATES]; - void *softclock_si; /* diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index 8d77365808d..c6fd7617fce 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_sysctl.c,v 1.262 2014/08/20 06:23:03 mikeb Exp $ */ +/* $OpenBSD: kern_sysctl.c,v 1.263 2014/09/04 19:14:47 miod Exp $ */ /* $NetBSD: kern_sysctl.c,v 1.17 1996/05/20 17:49:05 mrg Exp $ */ /*- @@ -266,7 +266,6 @@ kern_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp, dev_t dev; extern int somaxconn, sominconn; extern int usermount, nosuidcoredump; - extern long cp_time[CPUSTATES]; extern int stackgap_random; extern int maxlocksperuid; extern int pool_debug; @@ -465,6 +464,7 @@ kern_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp, { CPU_INFO_ITERATOR cii; struct cpu_info *ci; + long cp_time[CPUSTATES]; int i; memset(cp_time, 0, sizeof(cp_time)); diff --git a/sys/sys/dkstat.h b/sys/sys/dkstat.h index c1f9b7028db..fc437be0492 100644 --- a/sys/sys/dkstat.h +++ b/sys/sys/dkstat.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dkstat.h,v 1.8 2010/11/18 21:12:48 miod Exp $ */ +/* $OpenBSD: dkstat.h,v 1.9 2014/09/04 19:14:47 miod Exp $ */ /* $NetBSD: dkstat.h,v 1.8 1995/12/28 19:16:31 thorpej Exp $ */ /*- @@ -45,7 +45,5 @@ #define CPUSTATES 5 #ifdef _KERNEL -extern long cp_time[CPUSTATES]; - extern int64_t tk_cancc, tk_nin, tk_nout, tk_rawcc; #endif |