from netbsd:

Move the old-style disk instrumentation "structures" to a central
location (sys/kern/subr_disk.c) and note that they should/will be
deprecated.

10 files changed, 33 insertions, 25 deletions

diff --git a/sys/arch/hp300/hp300/autoconf.c b/sys/arch/hp300/hp300/autoconf.c
index 2c166e160bb..a0aac290066 100644
--- a/sys/arch/hp300/hp300/autoconf.c
+++ b/sys/arch/hp300/hp300/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.12 1995/12/02 18:11:21 thorpej Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.13 1995/12/28 19:16:45 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -73,7 +73,6 @@
  * the machine.
  */
 int	cold;		    /* if 1, still working on cold-start */
-int	dkn;		    /* number of iostat dk numbers assigned so far */
 int	cpuspeed = 0;	    /* relative cpu speed -- can be patched */	
 struct	isr isrqueue[NISR];
 struct	hp_hw sc_table[MAXCTLRS];
diff --git a/sys/arch/i386/i386/autoconf.c b/sys/arch/i386/i386/autoconf.c
index 8d94c7fcf0d..a1ab9c17e31 100644
--- a/sys/arch/i386/i386/autoconf.c
+++ b/sys/arch/i386/i386/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.13 1994/11/04 00:36:47 mycroft Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.14 1995/12/28 19:16:48 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -63,7 +63,6 @@
  * the configuration process, and are used in initializing
  * the machine.
  */
-int	dkn;		/* number of iostat dk numbers assigned so far */
 extern int	cold;		/* cold start flag initialized in locore.s */
 
 /*
diff --git a/sys/arch/mvme68k/mvme68k/autoconf.c b/sys/arch/mvme68k/mvme68k/autoconf.c
index 2a69cee5127..e43131db464 100644
--- a/sys/arch/mvme68k/mvme68k/autoconf.c
+++ b/sys/arch/mvme68k/mvme68k/autoconf.c
@@ -1,4 +1,4 @@
-/*	$Id: autoconf.c,v 1.3 1995/11/30 22:53:55 deraadt Exp $ */
+/*	$Id: autoconf.c,v 1.4 1995/12/30 09:24:29 deraadt Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -101,7 +101,6 @@
  * the machine.
  */
 extern int cold;		/* if 1, still working on cold-start */
-int dkn;			/* number of iostat dk numbers assigned so far */
 
 /* XXX must be allocated statically because of early console init */
 struct	map extiomap[EIOMAPSIZE/16];
diff --git a/sys/arch/pmax/pmax/autoconf.c b/sys/arch/pmax/pmax/autoconf.c
index 672f7d391f2..58c35afa6db 100644
--- a/sys/arch/pmax/pmax/autoconf.c
+++ b/sys/arch/pmax/pmax/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.13 1995/09/13 19:36:01 jonathan Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.14 1995/12/28 19:16:58 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -70,7 +70,6 @@
  * the machine.
  */
 int	cold = 1;	/* if 1, still working on cold-start */
-int	dkn;		/* number of iostat dk numbers assigned so far */
 int	cpuspeed = 30;	/* approx # instr per usec. */
 extern	int pmax_boardtype;
 extern	tc_option_t tc_slot_info[TC_MAX_LOGICAL_SLOTS];
diff --git a/sys/arch/pmax/pmax/conf-glue.c b/sys/arch/pmax/pmax/conf-glue.c
index 191c28fd3d9..12df9a1d8f1 100644
--- a/sys/arch/pmax/pmax/conf-glue.c
+++ b/sys/arch/pmax/pmax/conf-glue.c
@@ -144,8 +144,6 @@ configure_scsi()
 	register struct pmax_scsi_device *dp;
 	register struct pmax_driver *drp;
 
-	extern int dkn;	/* number of iostat dk numbers assigned */
-
 	/* probe and initialize SCSI buses */
 	for (cp = &pmax_scsi_table[0]; drp = cp->pmax_driver; cp++) {
 
diff --git a/sys/arch/sparc/sparc/autoconf.c b/sys/arch/sparc/sparc/autoconf.c
index a636bddbc71..fde266bbeae 100644
--- a/sys/arch/sparc/sparc/autoconf.c
+++ b/sys/arch/sparc/sparc/autoconf.c
@@ -109,7 +109,6 @@
  * the machine.
  */
 int	cold;		/* if 1, still working on cold-start */
-int	dkn;		/* number of iostat dk numbers assigned so far */
 int	fbnode;		/* node ID of ROM's console frame buffer */
 int	optionsnode;	/* node ID of ROM's options */
 int	cpumod;		/* CPU model, valid only if cputyp==CPU_SUN4 */
diff --git a/sys/arch/vax/uba/uba.c b/sys/arch/vax/uba/uba.c
index a129412e12c..999fb900183 100644
--- a/sys/arch/vax/uba/uba.c
+++ b/sys/arch/vax/uba/uba.c
@@ -1,4 +1,4 @@
-/*      $NetBSD: uba.c,v 1.11 1995/12/13 19:02:57 ragge Exp $      */
+/*      $NetBSD: uba.c,v 1.12 1995/12/28 19:17:07 thorpej Exp $      */
 
 /*
  * Copyright (c) 1982, 1986 The Regents of the University of California.
@@ -66,7 +66,6 @@
 #include "ubareg.h"
 #include "ubavar.h"
 
-int dkn;
 extern int cold;
 
 volatile int rbr,rcvec;
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index 75118472993..d45d02a5e8f 100644
--- a/sys/kern/kern_clock.c
+++ b/sys/kern/kern_clock.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_clock.c,v 1.22 1995/03/03 01:24:03 cgd Exp $	*/
+/*	$NetBSD: kern_clock.c,v 1.23 1995/12/28 19:16:41 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1986, 1991, 1993
@@ -418,8 +418,6 @@ stopprofclock(p)
 	}
 }
 
-int	dk_ndrive = DK_NDRIVE;
-
 /*
  * Statistics clock.  Grab profile sample, and if divider reaches 0,
  * do process and kernel statistics.
@@ -491,6 +489,8 @@ statclock(frame)
 	pscnt = psdiv;
 
 	/*
+	 * XXX Support old-style instrumentation for now.
+	 *
 	 * We maintain statistics shown by user-level statistics
 	 * programs:  the amount of time in each cpu state, and
 	 * the amount of time each of DK_NDRIVE ``drives'' is busy.
diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c
index 1fda3176a0e..f3615211358 100644
--- a/sys/kern/subr_disk.c
+++ b/sys/kern/subr_disk.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_disk.c,v 1.13 1995/03/29 20:57:35 mycroft Exp $	*/
+/*	$NetBSD: subr_disk.c,v 1.14 1995/12/28 19:16:39 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1988, 1993
@@ -45,6 +45,20 @@
 #include <sys/buf.h>
 #include <sys/disklabel.h>
 #include <sys/syslog.h>
+#include <sys/dkstat.h>		/* XXX */
+
+/*
+ * Old-style disk instrumentation structures.  These will go away
+ * someday.
+ */
+long	dk_seek[DK_NDRIVE];
+long	dk_time[DK_NDRIVE];
+long	dk_wds[DK_NDRIVE];
+long	dk_wpms[DK_NDRIVE];
+long	dk_xfer[DK_NDRIVE];
+int	dk_busy;
+int	dk_ndrive = DK_NDRIVE;
+int	dkn;			/* number of slots filled so far */
 
 /*
  * Seek sort for disks.  We depend on the driver which calls us using b_resid
diff --git a/sys/sys/dkstat.h b/sys/sys/dkstat.h
index 58b3e31b417..8ce9eaa17db 100644
--- a/sys/sys/dkstat.h
+++ b/sys/sys/dkstat.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: dkstat.h,v 1.7 1995/03/26 20:24:01 jtc Exp $	*/
+/*	$NetBSD: dkstat.h,v 1.8 1995/12/28 19:16:31 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -50,14 +50,16 @@
 #define	DK_NDRIVE	8
 #ifdef _KERNEL
 long cp_time[CPUSTATES];
-long dk_seek[DK_NDRIVE];
-long dk_time[DK_NDRIVE];
-long dk_wds[DK_NDRIVE];
-long dk_wpms[DK_NDRIVE];
-long dk_xfer[DK_NDRIVE];
 
-int dk_busy;
-int dk_ndrive;
+extern long dk_seek[];
+extern long dk_time[];
+extern long dk_wds[];
+extern long dk_wpms[];
+extern long dk_xfer[];
+
+extern int dk_busy;
+extern int dk_ndrive;
+extern int dkn;
 
 long tk_cancc;
 long tk_nin;