Originally when DEVFS was added, a global variable "devfs_present"

was used to control code which were conditional on DEVFS' precense
since this avoided the need for large-scale source pollution with
#include "opt_geom.h"

Now that we approach making DEVFS standard, replace these tests
with an #ifdef to facilitate mechanical removal once DEVFS becomes
non-optional.

No functional change by this commit.

1 files changed, 7 insertions, 5 deletions

diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index cf802ab..835ec39 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -2152,13 +2152,15 @@ fildesc_drvinit(void *unused)
 	make_dev_alias(dev, "stdout");
 	dev = make_dev(&fildesc_cdevsw, 2, UID_ROOT, GID_WHEEL, 0666, "fd/2");
 	make_dev_alias(dev, "stderr");
-	if (!devfs_present) {
-		int fd;
+#ifdef NODEVFS
+	{
+	int fd;
 
-		for (fd = 3; fd < NUMFDESC; fd++)
-			make_dev(&fildesc_cdevsw, fd, UID_ROOT, GID_WHEEL,
-			    0666, "fd/%d", fd);
+	for (fd = 3; fd < NUMFDESC; fd++)
+		make_dev(&fildesc_cdevsw, fd, UID_ROOT, GID_WHEEL,
+		    0666, "fd/%d", fd);
 	}
+#endif
 }
 
 static fo_rdwr_t	badfo_readwrite;