A litte trouble with declarations of boot() and panic() resolved. gcc-2.5.8

[unix-history] / sys / kern / vfs_conf.c

diff --git a/sys/kern/vfs_conf.c b/sys/kern/vfs_conf.c
index 01b3815..cc73786 100644 (file)
--- a/sys/kern/vfs_conf.c
+++ b/sys/kern/vfs_conf.c
@@ -31,19 +31,13 @@
  * SUCH DAMAGE.
  *
  *     from: @(#)vfs_conf.c    7.3 (Berkeley) 6/28/90
  * SUCH DAMAGE.
  *
  *     from: @(#)vfs_conf.c    7.3 (Berkeley) 6/28/90

- *     $Id: vfs_conf.c,v 1.2 1993/10/16 15:25:21 rgrimes Exp $
+ *     $Id: vfs_conf.c,v 1.4 1993/12/19 00:51:49 wollman Exp $

  */
 
 #include "param.h"
  */
 
 #include "param.h"

+#include "systm.h"

 #include "mount.h"
 
 #include "mount.h"
 

-/*
- * This specifies the filesystem used to mount the root.
- * This specification should be done by /etc/config.
- */
-extern int ufs_mountroot();
-int (*mountroot)() = ufs_mountroot;
-

 /*
  * These define the root filesystem and device.
  */
 /*
  * These define the root filesystem and device.
  */


@@ -72,9 +66,7 @@ extern        struct vfsops pcfs_vfsops;
 extern struct vfsops isofs_vfsops;
 #endif
 
 extern struct vfsops isofs_vfsops;
 #endif
 

-#ifdef PROCFS

 extern struct vfsops procfs_vfsops;
 extern struct vfsops procfs_vfsops;

-#endif

 
 struct vfsops *vfssw[] = {
        (struct vfsops *)0,     /* 0 = MOUNT_NONE */
 
 struct vfsops *vfssw[] = {
        (struct vfsops *)0,     /* 0 = MOUNT_NONE */


@@ -99,9 +91,5 @@ struct vfsops *vfssw[] = {
 #else
        (struct vfsops *)0,
 #endif
 #else
        (struct vfsops *)0,
 #endif

-#ifdef PROCFS

        &procfs_vfsops,         /* 6 = MOUNT_PROCFS */
        &procfs_vfsops,         /* 6 = MOUNT_PROCFS */

-#else
-       (struct vfsops *)0,
-#endif

 };
 };