Use dynamic major number allocation for /dev/console, there is no

longer any benefit from hard wiring it.

Remove special hack used to wire major to zero despite zero having a
different magic meaning as well.

2 files changed, 1 insertions, 10 deletions

diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c
index fe9339d..1344329 100644
--- a/sys/kern/kern_conf.c
+++ b/sys/kern/kern_conf.c
@@ -377,8 +377,7 @@ fini_cdevsw(struct cdevsw *devsw)
 		reserved_majors[devsw->d_maj] = 0;
 		devsw->d_maj = MAJOR_AUTO;
 		devsw->d_flags &= ~D_ALLOCMAJ;
-	} else if (devsw->d_maj == 0)
-		devsw->d_maj = 256;
+	}
 	devsw->d_flags &= ~D_INIT;
 }
 
@@ -430,8 +429,6 @@ prep_cdevsw(struct cdevsw *devsw)
 	if (devsw->d_maj == MAJOR_AUTO) {
 		find_major(devsw);
 	} else {
-		if (devsw->d_maj == 256)	/* XXX: tty_cons.c is magic */
-			devsw->d_maj = 0;	
 		KASSERT(devsw->d_maj >= 0 && devsw->d_maj < 256,
 		    ("Invalid major (%d) in make_dev", devsw->d_maj));
 		if (reserved_majors[devsw->d_maj] != devsw->d_maj) {
diff --git a/sys/kern/tty_cons.c b/sys/kern/tty_cons.c
index 5fae927..abd79ba 100644
--- a/sys/kern/tty_cons.c
+++ b/sys/kern/tty_cons.c
@@ -69,11 +69,6 @@ static	d_ioctl_t	cnioctl;
 static	d_poll_t	cnpoll;
 static	d_kqfilter_t	cnkqfilter;
 
-/*
- * XXX: We really want major #0, but zero here means
- * XXX: allocate a major number automatically.
- * XXX: kern_conf.c knows what to do when it sees 256.
- */
 static struct cdevsw cn_cdevsw = {
 	.d_version =	D_VERSION,
 	.d_open =	cnopen,
@@ -83,7 +78,6 @@ static struct cdevsw cn_cdevsw = {
 	.d_ioctl =	cnioctl,
 	.d_poll =	cnpoll,
 	.d_name =	"console",
-	.d_maj =	256,
 	.d_flags =	D_TTY | D_NEEDGIANT,
 	.d_kqfilter =	cnkqfilter,
 };