Remove old grunge, including references to sys/disk.h (which is going

away).

Submitted-by:	phk

14 files changed, 15 insertions, 58 deletions

diff --git a/sys/dev/vinum/vinum.c b/sys/dev/vinum/vinum.c
index 455b8be..04976b0 100644
--- a/sys/dev/vinum/vinum.c
+++ b/sys/dev/vinum/vinum.c
@@ -38,8 +38,6 @@
 
 #define STATIC static					    /* nothing while we're testing XXX */
 
-#define REALLYKERNEL
-#include "opt_vinum.h"
 #include <dev/vinum/vinumhdr.h>
 #include <sys/sysproto.h>				    /* for sync(2) */
 #ifdef VINUMDEBUG
diff --git a/sys/dev/vinum/vinumconfig.c b/sys/dev/vinum/vinumconfig.c
index 3668dad..1025848 100644
--- a/sys/dev/vinum/vinumconfig.c
+++ b/sys/dev/vinum/vinumconfig.c
@@ -50,8 +50,6 @@
 
 #define STATIC static
 
-#define REALLYKERNEL
-#include "opt_vinum.h"
 #include <dev/vinum/vinumhdr.h>
 #include <dev/vinum/request.h>
 
diff --git a/sys/dev/vinum/vinumext.h b/sys/dev/vinum/vinumext.h
index 5fe5cd1..75c507e 100644
--- a/sys/dev/vinum/vinumext.h
+++ b/sys/dev/vinum/vinumext.h
@@ -142,8 +142,6 @@ void sdio(struct buf *bp);
 /* XXX Do we need this? */
 int vinumpart(dev_t);
 
-/* Why aren't these declared anywhere? XXX */
-int setjmp(jmp_buf);
 extern jmp_buf command_fail;				    /* return here if config fails */
 
 #ifdef VINUMDEBUG
@@ -156,6 +154,7 @@ char *basename(char *);
 #else
 void longjmp(jmp_buf, int);				    /* the kernel doesn't define this */
 #endif
+int setjmp(jmp_buf);
 
 void expand_table(void **, int, int);
 
diff --git a/sys/dev/vinum/vinumhdr.h b/sys/dev/vinum/vinumhdr.h
index 38f3915..f4ded89 100644
--- a/sys/dev/vinum/vinumhdr.h
+++ b/sys/dev/vinum/vinumhdr.h
@@ -37,11 +37,8 @@
 /* Header files used by all modules */
 /* $Id: vinumhdr.h,v 1.12 1999/01/28 08:58:33 grog Exp grog $ */
 
-#ifdef KERNEL
-#define REALLYKERNEL
-#endif
 #include <sys/param.h>
-#ifdef REALLYKERNEL
+#ifdef KERNEL
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #endif
@@ -62,11 +59,6 @@
 #include <ufs/ffs/fs.h>
 #include <sys/mount.h>
 #include <sys/device.h>
-#undef KERNEL						    /* XXX */
-#include <sys/disk.h>
-#ifdef REALLYKERNEL
-#define KERNEL
-#endif
 #include <sys/syslog.h>
 #include <sys/fcntl.h>
 #include <sys/vnode.h>
@@ -86,7 +78,7 @@
 #include <dev/vinum/vinumext.h>
 
 #undef Free						    /* defined in some funny net stuff */
-#ifdef REALLYKERNEL
+#ifdef KERNEL
 #ifdef VINUMDEBUG
 #define Malloc(x)  MMalloc ((x), __FILE__, __LINE__)	    /* show where we came from */
 #define Free(x)	   FFree ((x), __FILE__, __LINE__)	    /* show where we came from */
diff --git a/sys/dev/vinum/vinuminterrupt.c b/sys/dev/vinum/vinuminterrupt.c
index 9ea3ca2..bc3f56c 100644
--- a/sys/dev/vinum/vinuminterrupt.c
+++ b/sys/dev/vinum/vinuminterrupt.c
@@ -35,11 +35,9 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: vinuminterrupt.c,v 1.4 1999/01/12 04:30:12 grog Exp grog $
+ * $Id: vinuminterrupt.c,v 1.5 1999/03/16 03:40:25 grog Exp grog $
  */
 
-#define REALLYKERNEL
-#include "opt_vinum.h"
 #include <dev/vinum/vinumhdr.h>
 #include <dev/vinum/request.h>
 #include <miscfs/specfs/specdev.h>
diff --git a/sys/dev/vinum/vinumio.c b/sys/dev/vinum/vinumio.c
index 0d51fbb..991a8be 100644
--- a/sys/dev/vinum/vinumio.c
+++ b/sys/dev/vinum/vinumio.c
@@ -33,14 +33,9 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: vinumio.c,v 1.21 1999/05/02 07:51:20 grog Exp $
+ * $Id: vinumio.c,v 1.24 1999/03/23 02:00:52 grog Exp grog $
  */
 
-#define STATIC						    /* nothing while we're testing XXX */
-
-#include "opt_vinum.h"
-
-#define REALLYKERNEL
 #include <dev/vinum/vinumhdr.h>
 #include <dev/vinum/request.h>
 #include <miscfs/specfs/specdev.h>
diff --git a/sys/dev/vinum/vinumioctl.c b/sys/dev/vinum/vinumioctl.c
index 9c5b450..a7472cc 100644
--- a/sys/dev/vinum/vinumioctl.c
+++ b/sys/dev/vinum/vinumioctl.c
@@ -40,13 +40,10 @@
  * $Id: vinumioctl.c,v 1.8 1999/03/23 02:46:39 grog Exp grog $
  */
 
-#define STATIC						    /* nothing while we're testing XXX */
-
-#define REALLYKERNEL
-#include "opt_vinum.h"
 #include <dev/vinum/vinumhdr.h>
 #include <dev/vinum/request.h>
 #include <sys/sysproto.h>				    /* for sync(2) */
+
 #ifdef VINUMDEBUG
 #include <sys/reboot.h>
 #endif
diff --git a/sys/dev/vinum/vinumlock.c b/sys/dev/vinum/vinumlock.c
index a28012b..7d7456b 100644
--- a/sys/dev/vinum/vinumlock.c
+++ b/sys/dev/vinum/vinumlock.c
@@ -36,8 +36,6 @@
  * $Id: vinumlock.c,v 1.9 1999/03/13 03:26:00 grog Exp grog $
  */
 
-#define REALLYKERNEL
-#include "opt_vinum.h"
 #include <dev/vinum/vinumhdr.h>
 
 /*
diff --git a/sys/dev/vinum/vinummemory.c b/sys/dev/vinum/vinummemory.c
index 8cdc040..357011c 100644
--- a/sys/dev/vinum/vinummemory.c
+++ b/sys/dev/vinum/vinummemory.c
@@ -36,8 +36,6 @@
  * $Id: vinummemory.c,v 1.20 1999/03/19 03:21:08 grog Exp grog $
  */
 
-#define REALLYKERNEL
-#include "opt_vinum.h"
 #include <dev/vinum/vinumhdr.h>
 
 #ifdef VINUMDEBUG
diff --git a/sys/dev/vinum/vinumparser.c b/sys/dev/vinum/vinumparser.c
index 9fb74db..3dda64d 100644
--- a/sys/dev/vinum/vinumparser.c
+++ b/sys/dev/vinum/vinumparser.c
@@ -56,27 +56,20 @@
  * a closing quote.  In this case, tokenize() returns -1. 
  */
 
-#ifdef KERNEL
-#include "opt_vinum.h"
-#endif
-
 #include <sys/param.h>
-#ifdef KERNEL
-#undef KERNEL						    /* XXX */
-#define REALLYKERNEL
-#include "opt_vinum.h"
-#else
+#ifndef KERNEL
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
 #endif
+#include <machine/setjmp.h>
 /* All this mess for a single struct definition */
 #include <sys/uio.h>
 #include <sys/namei.h>
 #include <sys/disklabel.h>
 #include <sys/mount.h>
+#include <sys/conf.h>
 #include <sys/device.h>
-#include <sys/disk.h>
 #include <sys/buf.h>
 
 #include <dev/vinum/vinumvar.h>
@@ -84,7 +77,7 @@
 #include <dev/vinum/vinumio.h>
 #include <dev/vinum/vinumext.h>
 
-#ifdef REALLYKERNEL
+#ifdef KERNEL
 #define isspace(c) ((c == ' ') || (c == '\t'))		    /* check for white space */
 #else /* get it from the headers */
 #include <ctype.h>
diff --git a/sys/dev/vinum/vinumrequest.c b/sys/dev/vinum/vinumrequest.c
index d022fe6..247949b 100644
--- a/sys/dev/vinum/vinumrequest.c
+++ b/sys/dev/vinum/vinumrequest.c
@@ -33,11 +33,9 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: vinumrequest.c,v 1.18 1999/03/28 08:54:25 grog Exp $
+ * $Id: vinumrequest.c,v 1.23 1999/03/20 21:58:38 grog Exp grog $
  */
 
-#define REALLYKERNEL
-#include "opt_vinum.h"
 #include <dev/vinum/vinumhdr.h>
 #include <dev/vinum/request.h>
 #include <miscfs/specfs/specdev.h>
diff --git a/sys/dev/vinum/vinumrevive.c b/sys/dev/vinum/vinumrevive.c
index 61b6ed2..8876a1d 100644
--- a/sys/dev/vinum/vinumrevive.c
+++ b/sys/dev/vinum/vinumrevive.c
@@ -33,11 +33,9 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: vinumrevive.c,v 1.6 1999/01/17 06:20:44 grog Exp grog $
+ * $Id: vinumrevive.c,v 1.7 1999/02/28 02:12:18 grog Exp grog $
  */
 
-#define REALLYKERNEL
-#include "opt_vinum.h"
 #include <dev/vinum/vinumhdr.h>
 #include <dev/vinum/request.h>
 
diff --git a/sys/dev/vinum/vinumstate.c b/sys/dev/vinum/vinumstate.c
index 074b552..2e9cc08 100644
--- a/sys/dev/vinum/vinumstate.c
+++ b/sys/dev/vinum/vinumstate.c
@@ -36,8 +36,6 @@
  * $Id: vinumstate.c,v 2.11 1999/03/13 04:47:09 grog Exp grog $
  */
 
-#define REALLYKERNEL
-#include "opt_vinum.h"
 #include <dev/vinum/vinumhdr.h>
 #include <dev/vinum/request.h>
 
diff --git a/sys/dev/vinum/vinumutil.c b/sys/dev/vinum/vinumutil.c
index f979736..63f695d 100644
--- a/sys/dev/vinum/vinumutil.c
+++ b/sys/dev/vinum/vinumutil.c
@@ -38,12 +38,9 @@
 
 /* This file contains utility routines used both in kernel and user context */
 
-#ifdef KERNEL
-#include "opt_vinum.h"
-#endif
 #include <dev/vinum/vinumhdr.h>
 #include <dev/vinum/statetexts.h>
-#ifndef REALLYKERNEL
+#ifndef KERNEL
 #include <stdio.h>
 extern jmp_buf command_fail;				    /* return on a failed command */
 #endif
@@ -217,14 +214,14 @@ sizespec(char *spec)
 		return size * sign * 1024 * 1024 * 1024;
 	    }
 	}
-#ifdef REALLYKERNEL
+#ifdef KERNEL
 	throw_rude_remark(EINVAL, "Invalid length specification: %s", spec);
 #else
 	fprintf(stderr, "Invalid length specification: %s", spec);
 	longjmp(command_fail, -1);
 #endif
     }
-#ifdef REALLYKERNEL
+#ifdef KERNEL
     throw_rude_remark(EINVAL, "Missing length specification");
 #else
     fprintf(stderr, "Missing length specification");