Remove non-standard <sys/dkstat.h> header. It has not contained anything

related to disk stastics for almost 17 years, and the remaining
userland-visible defines duplicate those found in <sys/sched.h>.

Move the remaining _KERNEL defines to <sys/tty.h> where they belong, and
update all users to cope with this.

ok kettenis@

7 files changed, 21 insertions, 22 deletions

diff --git a/usr.bin/systat/cpu.c b/usr.bin/systat/cpu.c
index 5d10bf8e50c..512a8807db9 100644
--- a/usr.bin/systat/cpu.c
+++ b/usr.bin/systat/cpu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.c,v 1.2 2013/09/11 07:01:03 mpi Exp $	*/
+/*	$OpenBSD: cpu.c,v 1.3 2014/09/15 19:08:21 miod Exp $	*/
 
 /*
  * Copyright (c) 2013 Reyk Floeter <reyk@openbsd.org>
@@ -47,7 +47,7 @@
  */
 
 #include <sys/param.h>
-#include <sys/dkstat.h>
+#include <sys/sched.h>
 #include <sys/sysctl.h>
 
 #include <stdlib.h>
diff --git a/usr.bin/systat/iostat.c b/usr.bin/systat/iostat.c
index 26b1a579d86..8a4adf0106f 100644
--- a/usr.bin/systat/iostat.c
+++ b/usr.bin/systat/iostat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: iostat.c,v 1.42 2013/07/09 15:37:43 beck Exp $	*/
+/*	$OpenBSD: iostat.c,v 1.43 2014/09/15 19:08:21 miod Exp $	*/
 /*	$NetBSD: iostat.c,v 1.5 1996/05/10 23:16:35 thorpej Exp $	*/
 
 /*
@@ -31,11 +31,11 @@
  */
 
 #include <sys/param.h>
-#include <sys/dkstat.h>
 #include <sys/buf.h>
-#include <sys/time.h>
-#include <sys/sysctl.h>
 #include <sys/mount.h>
+#include <sys/sched.h>
+#include <sys/sysctl.h>
+#include <sys/time.h>
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/usr.bin/systat/pigs.c b/usr.bin/systat/pigs.c
index fd6ce4d2d94..e4bf4532d39 100644
--- a/usr.bin/systat/pigs.c
+++ b/usr.bin/systat/pigs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pigs.c,v 1.26 2013/06/02 06:23:17 guenther Exp $	*/
+/*	$OpenBSD: pigs.c,v 1.27 2014/09/15 19:08:21 miod Exp $	*/
 /*	$NetBSD: pigs.c,v 1.3 1995/04/29 05:54:50 cgd Exp $	*/
 
 /*-
@@ -35,11 +35,11 @@
  */
 
 #include <sys/param.h>
-#include <sys/dkstat.h>
-#include <sys/resource.h>
-#include <sys/time.h>
 #include <sys/proc.h>
+#include <sys/resource.h>
+#include <sys/sched.h>
 #include <sys/sysctl.h>
+#include <sys/time.h>
 
 #include <curses.h>
 #include <math.h>
diff --git a/usr.bin/systat/vmstat.c b/usr.bin/systat/vmstat.c
index ddb97741684..b6646dac09e 100644
--- a/usr.bin/systat/vmstat.c
+++ b/usr.bin/systat/vmstat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmstat.c,v 1.76 2014/04/08 14:04:11 mpi Exp $	*/
+/*	$OpenBSD: vmstat.c,v 1.77 2014/09/15 19:08:21 miod Exp $	*/
 /*	$NetBSD: vmstat.c,v 1.5 1996/05/10 23:16:40 thorpej Exp $	*/
 
 /*-
@@ -35,14 +35,13 @@
  */
 
 #include <sys/param.h>
-#include <sys/dkstat.h>
 #include <sys/buf.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/sysctl.h>
-#include <sys/proc.h>
 #include <sys/namei.h>
+#include <sys/proc.h>
+#include <sys/sched.h>
+#include <sys/stat.h>
 #include <sys/sysctl.h>
+#include <sys/time.h>
 #include <sys/vmmeter.h>
 
 #include <ctype.h>
diff --git a/usr.bin/top/machine.c b/usr.bin/top/machine.c
index 2d9bccba1e1..c9b13d65ed1 100644
--- a/usr.bin/top/machine.c
+++ b/usr.bin/top/machine.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machine.c,v 1.78 2014/07/04 05:58:31 guenther Exp $	 */
+/* $OpenBSD: machine.c,v 1.79 2014/09/15 19:08:21 miod Exp $	 */
 
 /*-
  * Copyright (c) 1994 Thorsten Lockert <tholo@sigmasoft.com>
@@ -35,9 +35,9 @@
 
 #include <sys/types.h>
 #include <sys/param.h>
-#include <sys/dkstat.h>
 #include <sys/mount.h>
 #include <sys/proc.h>
+#include <sys/sched.h>
 #include <sys/swap.h>
 #include <sys/sysctl.h>
 
diff --git a/usr.bin/vmstat/dkstats.c b/usr.bin/vmstat/dkstats.c
index fbc0ddce74f..6d97256b3b6 100644
--- a/usr.bin/vmstat/dkstats.c
+++ b/usr.bin/vmstat/dkstats.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dkstats.c,v 1.35 2010/09/24 00:11:15 deraadt Exp $	*/
+/*	$OpenBSD: dkstats.c,v 1.36 2014/09/15 19:08:22 miod Exp $	*/
 /*	$NetBSD: dkstats.c,v 1.1 1996/05/10 23:19:27 thorpej Exp $	*/
 
 /*
@@ -34,9 +34,9 @@
  */
 
 #include <sys/param.h>
-#include <sys/dkstat.h>
 #include <sys/time.h>
 #include <sys/disk.h>
+#include <sys/sched.h>
 #include <sys/sysctl.h>
 #include <sys/tty.h>
 
diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c
index 2751bbfa668..729b83b256f 100644
--- a/usr.bin/vmstat/vmstat.c
+++ b/usr.bin/vmstat/vmstat.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: vmstat.c,v 1.29.4.1 1996/06/05 00:21:05 cgd Exp $	*/
-/*	$OpenBSD: vmstat.c,v 1.132 2014/07/13 21:13:51 kettenis Exp $	*/
+/*	$OpenBSD: vmstat.c,v 1.133 2014/09/15 19:08:22 miod Exp $	*/
 
 /*
  * Copyright (c) 1980, 1986, 1991, 1993
@@ -33,7 +33,6 @@
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/proc.h>
-#include <sys/dkstat.h>
 #include <sys/buf.h>
 #include <sys/namei.h>
 #include <sys/malloc.h>
@@ -42,6 +41,7 @@
 #include <sys/sysctl.h>
 #include <sys/device.h>
 #include <sys/pool.h>
+#include <sys/sched.h>
 #include <sys/vmmeter.h>
 
 #include <time.h>