diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2002-02-04 19:38:21 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2002-02-04 19:38:21 +0000 |
| commit | 31e904f89aee2b5ed35cb41f72444a42b2fc6033 (patch) | |
| tree | 2eb69abb1ead8605cc898a136ec9f6908bbc732a /sys | |
| parent | c9010f09a58f11eb61902f52b78bf2288189058f (diff) | |
Cleanup mountroot-related definitions.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/hp300/hp300/autoconf.c | 5 | ||||
| -rw-r--r-- | sys/kern/vfs_subr.c | 3 | ||||
| -rw-r--r-- | sys/nfs/swapnfs.c | 11 | ||||
| -rw-r--r-- | sys/sys/systm.h | 4 |
4 files changed, 7 insertions, 16 deletions
diff --git a/sys/arch/hp300/hp300/autoconf.c b/sys/arch/hp300/hp300/autoconf.c index cdb61c427df..fcf6624ee5b 100644 --- a/sys/arch/hp300/hp300/autoconf.c +++ b/sys/arch/hp300/hp300/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.21 2002/01/16 20:51:45 miod Exp $ */ +/* $OpenBSD: autoconf.c,v 1.22 2002/02/04 19:38:18 miod Exp $ */ /* $NetBSD: autoconf.c,v 1.45 1999/04/10 17:31:02 kleink Exp $ */ /* @@ -537,15 +537,12 @@ setroot() register int len; dev_t nrootdev, nswapdev = NODEV; char buf[128], *rootdevname; - extern int (*mountroot) __P((void)); dev_t temp; struct device *bootdv, *rootdv, *swapdv; int bootpartition = 0; #ifdef NFSCLIENT extern char *nfsbootdevname; - extern int nfs_mountroot __P((void)); #endif - extern int dk_mountroot __P((void)); bootdv = booted_device; diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index da612f77f05..c5f9b33e278 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_subr.c,v 1.81 2002/01/23 00:39:48 art Exp $ */ +/* $OpenBSD: vfs_subr.c,v 1.82 2002/02/04 19:38:20 miod Exp $ */ /* $NetBSD: vfs_subr.c,v 1.53 1996/04/22 01:39:13 christos Exp $ */ /* @@ -254,7 +254,6 @@ int vfs_mountroot() { struct vfsconf *vfsp; - extern int (*mountroot)(void); int error; if (mountroot != NULL) diff --git a/sys/nfs/swapnfs.c b/sys/nfs/swapnfs.c index 34f224c735c..0f00a91a1d9 100644 --- a/sys/nfs/swapnfs.c +++ b/sys/nfs/swapnfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: swapnfs.c,v 1.2 1996/04/17 04:50:43 mickey Exp $ */ +/* $OpenBSD: swapnfs.c,v 1.3 2002/02/04 19:38:20 miod Exp $ */ /* $NetBSD: swapnfs.c,v 1.9 1995/04/30 07:03:13 cgd Exp $ */ /* @@ -46,13 +46,9 @@ #include <sys/param.h> #include <sys/conf.h> -#include <sys/socket.h> -#include <sys/mount.h> - -#include <net/if.h> +#include <sys/systm.h> dev_t rootdev = NODEV; -dev_t argdev = NODEV; dev_t dumpdev = NODEV; struct swdevt swdevt[] = { @@ -60,5 +56,4 @@ struct swdevt swdevt[] = { { NODEV, 0, 0 } }; -extern int nfs_mountroot(); -int (*mountroot)() = nfs_mountroot; +int (*mountroot) __P((void)) = nfs_mountroot; diff --git a/sys/sys/systm.h b/sys/sys/systm.h index 53b21ab0ba5..62c097f3533 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: systm.h,v 1.44 2001/11/06 18:41:10 art Exp $ */ +/* $OpenBSD: systm.h,v 1.45 2002/02/04 19:38:20 miod Exp $ */ /* $NetBSD: systm.h,v 1.50 1996/06/09 04:55:09 briggs Exp $ */ /*- @@ -297,7 +297,7 @@ void kmstartup __P((void)); int nfs_mountroot __P((void)); int dk_mountroot __P((void)); -int (*mountroot)__P((void)); +extern int (*mountroot)__P((void)); #include <lib/libkern/libkern.h> |