Remove the SLICE code.

This clearly needs alot more thought, and we dont need this to hunt
us down in 3.0-RELEASE.

5 files changed, 5 insertions, 22 deletions

diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index c15e50a..de39a9f 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)init_main.c	8.9 (Berkeley) 1/21/94
- * $Id: init_main.c,v 1.94 1998/06/07 17:11:32 dfr Exp $
+ * $Id: init_main.c,v 1.95 1998/07/15 05:21:48 bde Exp $
  */
 
 #include "opt_devfs.h"
@@ -585,11 +585,6 @@ start_init(p)
 		(void)subyte(--ucp, 'C');
 		options = 1;
 #endif
-
-#if defined(DEVFS) && defined(SLICE)
-		(void)subyte(--ucp, 'd');
-		options = 1;
-#endif
 		if (options == 0)
 			(void)subyte(--ucp, '-');
 		(void)subyte(--ucp, '-');		/* leading hyphen */
diff --git a/sys/kern/vfs_conf.c b/sys/kern/vfs_conf.c
index 3bbc406..a7a830f 100644
--- a/sys/kern/vfs_conf.c
+++ b/sys/kern/vfs_conf.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_conf.c	8.8 (Berkeley) 3/31/94
- * $Id: vfs_conf.c,v 1.24 1998/04/20 03:57:30 julian Exp $
+ * $Id: vfs_conf.c,v 1.25 1998/06/09 12:52:33 bde Exp $
  */
 
 /*
@@ -51,7 +51,6 @@
  *		as an aid to conversion for kernel multithreading
  *		on SMP reentrancy
  */
-#include "opt_devfs.h" /* for SLICE */
 #include "opt_bootp.h"
 
 #include <sys/param.h>		/* dev_t (types.h)*/
@@ -75,9 +74,6 @@ dev_t rootdevs[] = { NODEV, NODEV };
 char *rootdevnames[2];
 struct vnode *rootvnode;
 char *mountrootfsname;
-#ifdef SLICE
-char	rootdevice[32];
-#endif
 #ifdef BOOTP
 extern void bootpc_init __P((void));
 #endif
diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c
index ae94741..7483363 100644
--- a/sys/kern/vfs_export.c
+++ b/sys/kern/vfs_export.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_subr.c	8.31 (Berkeley) 5/26/95
- * $Id: vfs_subr.c,v 1.161 1998/08/29 13:13:10 bde Exp $
+ * $Id: vfs_subr.c,v 1.162 1998/09/05 15:17:33 bde Exp $
  */
 
 /*
@@ -1113,7 +1113,6 @@ reassignbuf(bp, newvp)
 	splx(s);
 }
 
-#ifndef SLICE
 /*
  * Create a vnode for a block device.
  * Used for mounting the root file system.
@@ -1143,7 +1142,6 @@ bdevvp(dev, vpp)
 	*vpp = vp;
 	return (0);
 }
-#endif	/* !SLICE */
 
 /*
  * Check to see if the new vnode represents a special device
diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c
index 3bbc406..a7a830f 100644
--- a/sys/kern/vfs_mount.c
+++ b/sys/kern/vfs_mount.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_conf.c	8.8 (Berkeley) 3/31/94
- * $Id: vfs_conf.c,v 1.24 1998/04/20 03:57:30 julian Exp $
+ * $Id: vfs_conf.c,v 1.25 1998/06/09 12:52:33 bde Exp $
  */
 
 /*
@@ -51,7 +51,6 @@
  *		as an aid to conversion for kernel multithreading
  *		on SMP reentrancy
  */
-#include "opt_devfs.h" /* for SLICE */
 #include "opt_bootp.h"
 
 #include <sys/param.h>		/* dev_t (types.h)*/
@@ -75,9 +74,6 @@ dev_t rootdevs[] = { NODEV, NODEV };
 char *rootdevnames[2];
 struct vnode *rootvnode;
 char *mountrootfsname;
-#ifdef SLICE
-char	rootdevice[32];
-#endif
 #ifdef BOOTP
 extern void bootpc_init __P((void));
 #endif
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index ae94741..7483363 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_subr.c	8.31 (Berkeley) 5/26/95
- * $Id: vfs_subr.c,v 1.161 1998/08/29 13:13:10 bde Exp $
+ * $Id: vfs_subr.c,v 1.162 1998/09/05 15:17:33 bde Exp $
  */
 
 /*
@@ -1113,7 +1113,6 @@ reassignbuf(bp, newvp)
 	splx(s);
 }
 
-#ifndef SLICE
 /*
  * Create a vnode for a block device.
  * Used for mounting the root file system.
@@ -1143,7 +1142,6 @@ bdevvp(dev, vpp)
 	*vpp = vp;
 	return (0);
 }
-#endif	/* !SLICE */
 
 /*
  * Check to see if the new vnode represents a special device