diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-11-06 01:38:57 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-11-06 01:38:57 +0000 |
| commit | c4b9eaa29723695530b23ac0bd2d2d1ab5a5a9f8 (patch) | |
| tree | 5999269d64fda14102cd62eb315e26fe9ebcfb90 /sys/arch | |
| parent | 9730d99a05f8dd8a4a4d8b11fbe51152e280a94e (diff) | |
use dk_mountroot
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/arc/arc/autoconf.c | 13 | ||||
| -rw-r--r-- | sys/arch/i386/i386/autoconf.c | 6 | ||||
| -rw-r--r-- | sys/arch/sparc/sparc/autoconf.c | 9 |
3 files changed, 6 insertions, 22 deletions
diff --git a/sys/arch/arc/arc/autoconf.c b/sys/arch/arc/arc/autoconf.c index dd612da7821..0c6594f9132 100644 --- a/sys/arch/arc/arc/autoconf.c +++ b/sys/arch/arc/arc/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.3 1996/09/02 11:33:22 pefo Exp $ */ +/* $OpenBSD: autoconf.c,v 1.4 1996/11/06 01:38:35 deraadt Exp $ */ /* * Copyright (c) 1996 Per Fogelstrom * Copyright (c) 1995 Theo de Raadt @@ -41,7 +41,7 @@ * from: Utah Hdr: autoconf.c 1.31 91/01/21 * * from: @(#)autoconf.c 8.1 (Berkeley) 6/10/93 - * $Id: autoconf.c,v 1.3 1996/09/02 11:33:22 pefo Exp $ + * $Id: autoconf.c,v 1.4 1996/11/06 01:38:35 deraadt Exp $ */ /* @@ -219,14 +219,9 @@ setroot() struct device *dv; dev_t nrootdev, nswapdev = NODEV; char buf[128]; - extern int (*mountroot) __P((void *)); #if defined(NFSCLIENT) extern char *nfsbootdevname; - extern int nfs_mountroot __P((void *)); -#endif -#if defined(FFS) - extern int ffs_mountroot __P((void *)); #endif /* Lookup boot device from boot if not set by configuration */ @@ -360,15 +355,13 @@ gotswap: nfsbootdevname = bootdv->dv_xname; return; #endif -#if defined(FFS) case DV_DISK: - mountroot = ffs_mountroot; + mountroot = dk_mountroot; majdev = major(rootdev); mindev = minor(rootdev); printf("root on %s%c\n", bootdv->dv_xname, (mindev & PARTITIONMASK) + 'a'); break; -#endif default: printf("can't figure root, hope your kernel is right\n"); return; diff --git a/sys/arch/i386/i386/autoconf.c b/sys/arch/i386/i386/autoconf.c index f6d8fdb485c..dd9f59c7762 100644 --- a/sys/arch/i386/i386/autoconf.c +++ b/sys/arch/i386/i386/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.15 1996/10/16 23:11:44 deraadt Exp $ */ +/* $OpenBSD: autoconf.c,v 1.16 1996/11/06 01:37:23 deraadt Exp $ */ /* $NetBSD: autoconf.c,v 1.20 1996/05/03 19:41:56 christos Exp $ */ /*- @@ -249,8 +249,6 @@ struct genericconf { void setconf() { - extern int ffs_mountroot __P((void *)); - extern int (*mountroot) __P((void *)); register struct genericconf *gc; int unit; #if 0 @@ -327,7 +325,7 @@ noask: } doswap: - mountroot = ffs_mountroot; + mountroot = dk_mountroot; swdevt[0].sw_dev = argdev = dumpdev = makedev(major(rootdev), minor(rootdev) + 1); /* swap size and dumplo set during autoconfigure */ diff --git a/sys/arch/sparc/sparc/autoconf.c b/sys/arch/sparc/sparc/autoconf.c index d5fc9eaf742..91294914f85 100644 --- a/sys/arch/sparc/sparc/autoconf.c +++ b/sys/arch/sparc/sparc/autoconf.c @@ -1899,17 +1899,12 @@ setroot() register int len, majdev, mindev; dev_t nrootdev, nswapdev = NODEV; char buf[128]; - extern int (*mountroot) __P((void *)); dev_t temp; struct mountroot_hook *mrhp; struct device *bootdv; struct bootpath *bp; #if defined(NFSCLIENT) extern char *nfsbootdevname; - extern int nfs_mountroot __P((void *)); -#endif -#if defined(FFS) - extern int ffs_mountroot __P((void *)); #endif bp = nbootpath == 0 ? NULL : &bootpath[nbootpath-1]; @@ -2041,15 +2036,13 @@ gotswap: nfsbootdevname = bootdv->dv_xname; return; #endif -#if defined(FFS) case DV_DISK: - mountroot = ffs_mountroot; + mountroot = dk_mountroot; majdev = major(rootdev); mindev = minor(rootdev); printf("root on %s%c\n", bootdv->dv_xname, (mindev & PARTITIONMASK) + 'a'); break; -#endif default: printf("can't figure root, hope your kernel is right\n"); return; |