diff options
author | Bruce Evans <bde@FreeBSD.org> | 1997-02-11 15:03:31 +0000 |
---|---|---|
committer | Bruce Evans <bde@FreeBSD.org> | 1997-02-11 15:03:31 +0000 |
commit | 3d1713a8a55e52bb5ef7fb038a386a59ba21de03 (patch) | |
tree | 514b0debbe10085eeb00b069d21209875db3806c /sys/amd64 | |
parent | 1c3ae7291429f0c4f772b14d4c8a494c524c95da (diff) | |
download | src-3d1713a8a55e52bb5ef7fb038a386a59ba21de03.tar.gz src-3d1713a8a55e52bb5ef7fb038a386a59ba21de03.zip |
Restored changes from rev.1.58-1.60 which were blown away by the
previous commit.
Notes
Notes:
svn path=/head/; revision=22564
Diffstat (limited to 'sys/amd64')
-rw-r--r-- | sys/amd64/amd64/autoconf.c | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c index 6e305d0b6acb..c39f5893d792 100644 --- a/sys/amd64/amd64/autoconf.c +++ b/sys/amd64/amd64/autoconf.c @@ -161,11 +161,6 @@ configure(dummy) enable_intr(); INTREN(IRQ_SLAVE); -#if NCRD > 0 - /* Before isa_configure to avoid ISA drivers finding our cards */ - pccard_configure(); -#endif - #if NEISA > 0 eisa_configure(); #endif @@ -178,6 +173,11 @@ configure(dummy) isa_configure(); #endif +#if NCRD > 0 + /* After everyone else has a chance at grabbing resources */ + pccard_configure(); +#endif + if (setdumpdev(dumpdev) != 0) dumpdev = NODEV; @@ -227,14 +227,6 @@ configure(dummy) } #endif -#ifdef NFS - if (!mountrootfsname && nfs_diskless_valid) { - if (bootverbose) - printf("Considering NFS root f/s.\n"); - mountrootfsname = "nfs"; - } -#endif /* NFS */ - #ifdef MFS_ROOT if (!mountrootfsname) { if (bootverbose) @@ -252,6 +244,15 @@ configure(dummy) setroot(); } #endif + +#ifdef NFS + if (!mountrootfsname && nfs_diskless_valid) { + if (bootverbose) + printf("Considering NFS root f/s.\n"); + mountrootfsname = "nfs"; + } +#endif /* NFS */ + #ifdef FFS if (!mountrootfsname) { mountrootfsname = "ufs"; @@ -269,6 +270,7 @@ configure(dummy) setroot(); } #endif + #ifdef LFS if (!mountrootfsname) { if (bootverbose) @@ -286,6 +288,7 @@ configure(dummy) setroot(); } #endif + if (!mountrootfsname) { panic("Nobody wants to mount my root for me"); } @@ -397,4 +400,4 @@ sysctl_kern_dumpdev SYSCTL_HANDLER_ARGS } SYSCTL_PROC(_kern, KERN_DUMPDEV, dumpdev, CTLTYPE_OPAQUE|CTLFLAG_RW, - 0, sizeof dumpdev, sysctl_kern_dumpdev, "I", ""); + 0, sizeof dumpdev, sysctl_kern_dumpdev, "T,dev_t", ""); |