diff --git a/sys/alpha/conf/GENERIC b/sys/alpha/conf/GENERIC index 21edd4564b71..388a33384de2 100644 --- a/sys/alpha/conf/GENERIC +++ b/sys/alpha/conf/GENERIC @@ -58,7 +58,6 @@ options NFS #Network Filesystem options NFS_ROOT #NFS usable as root device options MSDOSFS #MSDOS Filesystem options CD9660 #ISO 9660 Filesystem -options DEVFS #Device Filesystem options PROCFS #Process filesystem options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI diff --git a/sys/alpha/conf/NOTES b/sys/alpha/conf/NOTES index 21edd4564b71..388a33384de2 100644 --- a/sys/alpha/conf/NOTES +++ b/sys/alpha/conf/NOTES @@ -58,7 +58,6 @@ options NFS #Network Filesystem options NFS_ROOT #NFS usable as root device options MSDOSFS #MSDOS Filesystem options CD9660 #ISO 9660 Filesystem -options DEVFS #Device Filesystem options PROCFS #Process filesystem options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 2dada597328e..3421fdb87f27 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -40,7 +40,6 @@ options NFS #Network Filesystem options NFS_ROOT #NFS usable as root device, NFS required options MSDOSFS #MSDOS Filesystem options CD9660 #ISO 9660 Filesystem -options DEVFS #Device Filesystem options PROCFS #Process filesystem options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 810420abe42b..14302b201876 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -672,7 +672,7 @@ options PORTAL #Portal filesystem options PROCFS #Process filesystem options UMAPFS #UID map filesystem options UNION #Union filesystem -options DEVFS #devices filesystem +# options NODEVFS #disable devices filesystem # The xFS_ROOT options REQUIRE the associated ``options xFS'' options NFS_ROOT #NFS usable as root device # This code enables IFS, an FFS which exports inodes as the namespace. diff --git a/sys/conf/files b/sys/conf/files index b0fe74d730b1..92b19c87f14e 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -585,9 +585,9 @@ dev/wds/wd7000.c optional wds isa dev/wi/if_wi.c optional wi card dev/wi/if_wi.c optional wi pccard dev/xe/if_xe.c optional xe card -fs/devfs/devfs_vnops.c optional devfs -fs/devfs/devfs_vfsops.c optional devfs -fs/devfs/devfs_devs.c optional devfs +fs/devfs/devfs_vnops.c standard +fs/devfs/devfs_vfsops.c standard +fs/devfs/devfs_devs.c standard fs/hpfs/hpfs_vfsops.c optional hpfs fs/hpfs/hpfs_vnops.c optional hpfs fs/hpfs/hpfs_hash.c optional hpfs diff --git a/sys/conf/options b/sys/conf/options index 9ed2314fc356..74f54eeb1617 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -62,7 +62,7 @@ CY_PCI_FASTINTR DDB DDB_UNATTENDED opt_ddb.h GDB_REMOTE_CHAT opt_ddb.h -DEVFS +NODEVFS opt_devfs.h HW_WDOG KTRACE LIBICONV diff --git a/sys/fs/devfs/devfs_devs.c b/sys/fs/devfs/devfs_devs.c index 4dfd0e5c7f49..224ca078a70c 100644 --- a/sys/fs/devfs/devfs_devs.c +++ b/sys/fs/devfs/devfs_devs.c @@ -30,6 +30,7 @@ */ #include "opt_devfs.h" +#ifndef NODEVFS #include #include @@ -431,3 +432,4 @@ devfs_destroy(dev_t dev) devfs_create_t *devfs_create_hook = devfs_create; devfs_destroy_t *devfs_destroy_hook = devfs_destroy; int devfs_present = 1; +#endif diff --git a/sys/fs/devfs/devfs_vfsops.c b/sys/fs/devfs/devfs_vfsops.c index 69ec9b21fbbe..6ab9cf175588 100644 --- a/sys/fs/devfs/devfs_vfsops.c +++ b/sys/fs/devfs/devfs_vfsops.c @@ -35,6 +35,7 @@ */ #include "opt_devfs.h" +#ifndef NODEVFS #include #include @@ -207,3 +208,4 @@ static struct vfsops devfs_vfsops = { }; VFS_SET(devfs_vfsops, devfs, VFCF_SYNTHETIC); +#endif diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c index 80dfad8e9d60..fc0e39212f1e 100644 --- a/sys/fs/devfs/devfs_vnops.c +++ b/sys/fs/devfs/devfs_vnops.c @@ -1,4 +1,3 @@ -#define DEBUG 1 /* * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. @@ -35,6 +34,9 @@ * $FreeBSD$ */ +#include +#ifndef NODEVFS + #include #include #include @@ -193,10 +195,6 @@ devfs_getattr(ap) vap->va_nlink = de->de_links; vap->va_fileid = de->de_inode; -#ifdef DEBUG - if (error) - printf("devfs_getattr: return error %d\n", error); -#endif return (error); } @@ -711,3 +709,4 @@ static struct vnodeopv_desc devfs_specop_opv_desc = { &devfs_specop_p, devfs_specop_entries }; VNODEOP_SET(devfs_specop_opv_desc); +#endif diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 2dada597328e..3421fdb87f27 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -40,7 +40,6 @@ options NFS #Network Filesystem options NFS_ROOT #NFS usable as root device, NFS required options MSDOSFS #MSDOS Filesystem options CD9660 #ISO 9660 Filesystem -options DEVFS #Device Filesystem options PROCFS #Process filesystem options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI diff --git a/sys/i386/conf/NEWCARD b/sys/i386/conf/NEWCARD index a08d62b9688b..b65a7baea979 100644 --- a/sys/i386/conf/NEWCARD +++ b/sys/i386/conf/NEWCARD @@ -44,7 +44,6 @@ options NFS #Network Filesystem options NFS_ROOT #NFS usable as root device, NFS required options MSDOSFS #MSDOS Filesystem options CD9660 #ISO 9660 Filesystem -options DEVFS #Device Filesystem options PROCFS #Process filesystem options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 810420abe42b..14302b201876 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -672,7 +672,7 @@ options PORTAL #Portal filesystem options PROCFS #Process filesystem options UMAPFS #UID map filesystem options UNION #Union filesystem -options DEVFS #devices filesystem +# options NODEVFS #disable devices filesystem # The xFS_ROOT options REQUIRE the associated ``options xFS'' options NFS_ROOT #NFS usable as root device # This code enables IFS, an FFS which exports inodes as the namespace. diff --git a/sys/ia64/conf/GENERIC b/sys/ia64/conf/GENERIC index 9c6f5a0f67b8..258e6c423e48 100644 --- a/sys/ia64/conf/GENERIC +++ b/sys/ia64/conf/GENERIC @@ -36,7 +36,6 @@ options INET6 #IPv6 communications protocols options FFS #Berkeley Fast Filesystem options SOFTUPDATES #Enable FFS soft updates support options MFS #Memory Filesystem -#options DEVFS #Device Filesystem options MD_ROOT #MD is a potential root device options NFS #Network Filesystem options NFS_ROOT #NFS usable as root device diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC index 22e1a8033e3a..aa6756770fb9 100644 --- a/sys/pc98/conf/GENERIC +++ b/sys/pc98/conf/GENERIC @@ -42,7 +42,6 @@ options NFS #Network Filesystem options NFS_ROOT #NFS usable as root device, NFS required options MSDOSFS #MSDOS Filesystem options CD9660 #ISO 9660 Filesystem -#options DEVFS #Device Filesystem options PROCFS #Process filesystem options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI