Send the remains (such as I have located) of "block major numbers" to

the bit-bucket.

153 files changed, 4 insertions, 183 deletions

diff --git a/sys/alpha/alpha/mem.c b/sys/alpha/alpha/mem.c
index 4819a7aaa0db..93e3c17ebceb 100644
--- a/sys/alpha/alpha/mem.c
+++ b/sys/alpha/alpha/mem.c
@@ -93,7 +93,6 @@ static struct cdevsw mem_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_MEM,
-	/* bmaj */	-1
 };
 
 struct mem_range_softc mem_range_softc;
diff --git a/sys/alpha/alpha/promcons.c b/sys/alpha/alpha/promcons.c
index c228bf8a8e0b..47fba42b05f4 100644
--- a/sys/alpha/alpha/promcons.c
+++ b/sys/alpha/alpha/promcons.c
@@ -77,7 +77,6 @@ static struct cdevsw prom_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 
diff --git a/sys/alpha/tlsb/zs_tlsb.c b/sys/alpha/tlsb/zs_tlsb.c
index 8a77a19fd5d7..f6b67b869791 100644
--- a/sys/alpha/tlsb/zs_tlsb.c
+++ b/sys/alpha/tlsb/zs_tlsb.c
@@ -82,7 +82,6 @@ static struct cdevsw zs_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 static void	zsstart __P((struct tty *));
diff --git a/sys/amd64/amd64/mem.c b/sys/amd64/amd64/mem.c
index 7b6baff08937..a5a913506527 100644
--- a/sys/amd64/amd64/mem.c
+++ b/sys/amd64/amd64/mem.c
@@ -89,7 +89,6 @@ static struct cdevsw mem_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_MEM,
-	/* bmaj */	-1
 };
 
 MALLOC_DEFINE(M_MEMDESC, "memdesc", "memory range descriptors");
diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c
index 0eee198f61e3..5163d2062360 100644
--- a/sys/cam/cam_xpt.c
+++ b/sys/cam/cam_xpt.c
@@ -599,7 +599,6 @@ static struct cdevsw xpt_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 static struct intr_config_hook *xpt_config_hook;
diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c
index cf6482eb062d..40c540b3fe89 100644
--- a/sys/cam/scsi/scsi_cd.c
+++ b/sys/cam/scsi/scsi_cd.c
@@ -176,7 +176,6 @@ static struct cd_quirk_entry cd_quirk_table[] =
 #endif
 
 #define CD_CDEV_MAJOR 15
-#define CD_BDEV_MAJOR 6
 
 static	d_open_t	cdopen;
 static	d_close_t	cdclose;
@@ -265,7 +264,6 @@ static struct cdevsw cd_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_DISK,
-	/* bmaj */	CD_BDEV_MAJOR
 };
 static struct cdevsw cddisk_cdevsw;
 
diff --git a/sys/cam/scsi/scsi_ch.c b/sys/cam/scsi/scsi_ch.c
index 2923ab201f5d..4c8afdbe8a9d 100644
--- a/sys/cam/scsi/scsi_ch.c
+++ b/sys/cam/scsi/scsi_ch.c
@@ -225,7 +225,6 @@ static struct cdevsw ch_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 static struct extend_array *chperiphs;
diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c
index cdd70d2dea14..5b5956f626eb 100644
--- a/sys/cam/scsi/scsi_da.c
+++ b/sys/cam/scsi/scsi_da.c
@@ -302,7 +302,6 @@ static struct periph_driver dadriver =
 PERIPHDRIVER_DECLARE(da, dadriver);
 
 #define DA_CDEV_MAJOR 13
-#define DA_BDEV_MAJOR 4
 
 /* For 2.2-stable support */
 #ifndef D_DISK
@@ -323,7 +322,6 @@ static struct cdevsw da_cdevsw = {
 	/* dump */	dadump,
 	/* psize */	nopsize,
 	/* flags */	D_DISK,
-	/* bmaj */	DA_BDEV_MAJOR
 };
 
 static struct cdevsw dadisk_cdevsw;
diff --git a/sys/cam/scsi/scsi_pass.c b/sys/cam/scsi/scsi_pass.c
index 791a71dcdcf6..7c47bc287f6f 100644
--- a/sys/cam/scsi/scsi_pass.c
+++ b/sys/cam/scsi/scsi_pass.c
@@ -123,7 +123,6 @@ static struct cdevsw pass_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 static struct extend_array *passperiphs;
diff --git a/sys/cam/scsi/scsi_pt.c b/sys/cam/scsi/scsi_pt.c
index beec14d438dd..61b9d045ef70 100644
--- a/sys/cam/scsi/scsi_pt.c
+++ b/sys/cam/scsi/scsi_pt.c
@@ -132,7 +132,6 @@ static struct cdevsw pt_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 static struct extend_array *ptperiphs;
diff --git a/sys/cam/scsi/scsi_sa.c b/sys/cam/scsi/scsi_sa.c
index e15aa6624f46..f288e4a0e9af 100644
--- a/sys/cam/scsi/scsi_sa.c
+++ b/sys/cam/scsi/scsi_sa.c
@@ -425,7 +425,6 @@ static struct cdevsw sa_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_TAPE,
-	/* bmaj */	-1
 };
 
 static struct extend_array *saperiphs;
diff --git a/sys/cam/scsi/scsi_ses.c b/sys/cam/scsi/scsi_ses.c
index f42a4b39ad2f..7e4b818d6e37 100644
--- a/sys/cam/scsi/scsi_ses.c
+++ b/sys/cam/scsi/scsi_ses.c
@@ -190,7 +190,6 @@ static struct cdevsw ses_cdevsw =
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 static struct extend_array *sesperiphs;
 
diff --git a/sys/cam/scsi/scsi_target.c b/sys/cam/scsi/scsi_target.c
index cad49a31bdaa..06fc32476b4a 100644
--- a/sys/cam/scsi/scsi_target.c
+++ b/sys/cam/scsi/scsi_target.c
@@ -180,7 +180,6 @@ static struct cdevsw targ_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 static int		targsendccb(struct cam_periph *periph, union ccb *ccb,
diff --git a/sys/coda/coda_fbsd.c b/sys/coda/coda_fbsd.c
index 76dc62ed1bad..8111691c6c14 100644
--- a/sys/coda/coda_fbsd.c
+++ b/sys/coda/coda_fbsd.c
@@ -78,7 +78,6 @@ static struct cdevsw codadevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 int     vcdebug = 1;
diff --git a/sys/contrib/dev/fla/fla.c b/sys/contrib/dev/fla/fla.c
index 3b0b03b0ceaf..54a98b94c6df 100644
--- a/sys/contrib/dev/fla/fla.c
+++ b/sys/contrib/dev/fla/fla.c
@@ -39,7 +39,6 @@ static int fla_debug = 0;
 SYSCTL_INT(_debug, OID_AUTO, fladebug, CTLFLAG_RW, &fla_debug, 0, "");
 
 #define CDEV_MAJOR	102
-#define BDEV_MAJOR	28
 
 static d_strategy_t flastrategy;
 static d_open_t flaopen;
@@ -60,7 +59,6 @@ static struct cdevsw fla_cdevsw = {
         /* dump */      nodump,
         /* psize */     nopsize,
         /* flags */     D_DISK | D_CANFREE,
-        /* bmaj */      BDEV_MAJOR
 };
 static struct cdevsw fladisk_cdevsw;
 
diff --git a/sys/dev/aac/aac.c b/sys/dev/aac/aac.c
index 0d025e33fb69..ccffb18ed4bb 100644
--- a/sys/dev/aac/aac.c
+++ b/sys/dev/aac/aac.c
@@ -163,7 +163,6 @@ static struct cdevsw aac_cdevsw = {
     nodump,		/* dump */
     nopsize,		/* psize */
     0,			/* flags */
-    -1,			/* bmaj */
 };
 
 /********************************************************************************
diff --git a/sys/dev/aac/aac_disk.c b/sys/dev/aac/aac_disk.c
index 631902761e1f..09bd9716445b 100644
--- a/sys/dev/aac/aac_disk.c
+++ b/sys/dev/aac/aac_disk.c
@@ -74,7 +74,6 @@ static struct cdevsw aac_disk_cdevsw = {
     /* dump */		nodump,
     /* psize */ 	nopsize,
     /* flags */		D_DISK,
-    /* bmaj */		-1
 };
 
 devclass_t		aac_disk_devclass;
diff --git a/sys/dev/agp/agp.c b/sys/dev/agp/agp.c
index a9d85bb2c090..6419635a3e98 100644
--- a/sys/dev/agp/agp.c
+++ b/sys/dev/agp/agp.c
@@ -82,7 +82,6 @@ static struct cdevsw agp_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_TTY,
-	/* bmaj */	-1
 };
 
 static devclass_t agp_devclass;
diff --git a/sys/dev/amr/amr.c b/sys/dev/amr/amr.c
index 5fe07e28591b..e17f38a269c6 100644
--- a/sys/dev/amr/amr.c
+++ b/sys/dev/amr/amr.c
@@ -78,7 +78,6 @@ static struct cdevsw amr_cdevsw = {
 		/* dump */	nodump,
 		/* psize */ 	nopsize,
 		/* flags */	0,
-		/* bmaj */	254	/* XXX magic no-bdev */
 };
 
 /*
diff --git a/sys/dev/amr/amr_disk.c b/sys/dev/amr/amr_disk.c
index c2038fe0ae22..bd9c729fd98f 100644
--- a/sys/dev/amr/amr_disk.c
+++ b/sys/dev/amr/amr_disk.c
@@ -76,7 +76,6 @@ static struct cdevsw amrd_cdevsw = {
 		/* dump */	nodump,
 		/* psize */ 	nopsize,
 		/* flags */	D_DISK,
-		/* bmaj */	254
 };
 
 static devclass_t	amrd_devclass;
diff --git a/sys/dev/asr/asr.c b/sys/dev/asr/asr.c
index eda4e74a4bf4..5fa8e089414c 100644
--- a/sys/dev/asr/asr.c
+++ b/sys/dev/asr/asr.c
@@ -546,7 +546,6 @@ STATIC struct cdevsw asr_cdevsw = {
         nodump,         /* dump     */
         nopsize,        /* psize    */
         0,              /* flags    */
-        -1              /* bmaj     */
 };
 
 #ifdef ASR_MEASURE_PERFORMANCE
diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c
index a6fb7b749a2f..4b04a3158621 100644
--- a/sys/dev/ata/ata-all.c
+++ b/sys/dev/ata/ata-all.c
@@ -69,7 +69,6 @@ static struct cdevsw ata_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 /* prototypes */
diff --git a/sys/dev/ata/ata-disk.c b/sys/dev/ata/ata-disk.c
index b3b2b3a3605e..060ebac03e70 100644
--- a/sys/dev/ata/ata-disk.c
+++ b/sys/dev/ata/ata-disk.c
@@ -69,7 +69,6 @@ static struct cdevsw ad_cdevsw = {
 	/* dump */	addump,
 	/* psize */	nopsize,
 	/* flags */	D_DISK,
-	/* bmaj */	30
 };
 static struct cdevsw addisk_cdevsw;
 
diff --git a/sys/dev/ata/ata-raid.c b/sys/dev/ata/ata-raid.c
index 0dfa263954d4..30cbd7643342 100644
--- a/sys/dev/ata/ata-raid.c
+++ b/sys/dev/ata/ata-raid.c
@@ -64,7 +64,6 @@ static struct cdevsw ar_cdevsw = {
 	/* dump */      nodump,
 	/* psize */     nopsize,
 	/* flags */     D_DISK,
-	/* bmaj */      -1
 };  
 static struct cdevsw ardisk_cdevsw;
 
diff --git a/sys/dev/ata/atapi-cd.c b/sys/dev/ata/atapi-cd.c
index 6b6bab3f03b3..d2a15916d888 100644
--- a/sys/dev/ata/atapi-cd.c
+++ b/sys/dev/ata/atapi-cd.c
@@ -66,7 +66,6 @@ static struct cdevsw acd_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_DISK | D_TRACKCLOSE,
-	/* bmaj */	31
 };
 
 /* prototypes */
diff --git a/sys/dev/ata/atapi-fd.c b/sys/dev/ata/atapi-fd.c
index 9a8bc442906f..6905a296799f 100644
--- a/sys/dev/ata/atapi-fd.c
+++ b/sys/dev/ata/atapi-fd.c
@@ -62,7 +62,6 @@ static struct cdevsw afd_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_DISK | D_TRACKCLOSE,
-	/* bmaj */	32
 };
 static struct cdevsw afddisk_cdevsw;
 
diff --git a/sys/dev/ata/atapi-tape.c b/sys/dev/ata/atapi-tape.c
index c22fb8cf0e53..a5f3f429317c 100644
--- a/sys/dev/ata/atapi-tape.c
+++ b/sys/dev/ata/atapi-tape.c
@@ -62,7 +62,6 @@ static struct cdevsw ast_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_TAPE | D_TRACKCLOSE,
-	/* bmaj */	-1
 };
 
 /* prototypes */
diff --git a/sys/dev/atkbdc/psm.c b/sys/dev/atkbdc/psm.c
index 6b670ea72a42..a756073ae38d 100644
--- a/sys/dev/atkbdc/psm.c
+++ b/sys/dev/atkbdc/psm.c
@@ -338,7 +338,6 @@ static struct cdevsw psm_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 /* debug message level */
diff --git a/sys/dev/bktr/bktr_os.c b/sys/dev/bktr/bktr_os.c
index 0f8110f096d9..f916864136ee 100644
--- a/sys/dev/bktr/bktr_os.c
+++ b/sys/dev/bktr/bktr_os.c
@@ -249,7 +249,6 @@ static struct cdevsw bktr_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 DRIVER_MODULE(bktr, pci, bktr_driver, bktr_devclass, 0, 0);
diff --git a/sys/dev/ccd/ccd.c b/sys/dev/ccd/ccd.c
index 13964a39276c..57067f2966ff 100644
--- a/sys/dev/ccd/ccd.c
+++ b/sys/dev/ccd/ccd.c
@@ -167,7 +167,6 @@ static d_psize_t ccdsize;
 #define NCCDFREEHIWAT	16
 
 #define CDEV_MAJOR 74
-#define BDEV_MAJOR 21
 
 static struct cdevsw ccd_cdevsw = {
 	/* open */	ccdopen,
@@ -183,7 +182,6 @@ static struct cdevsw ccd_cdevsw = {
 	/* dump */	ccddump,
 	/* psize */	ccdsize,
 	/* flags */	D_DISK,
-	/* bmaj */	BDEV_MAJOR
 };
 
 /* called during module initialization */
diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index 7d7671d9419b..f5161a6f4eb3 100644
--- a/sys/dev/cy/cy.c
+++ b/sys/dev/cy/cy.c
@@ -406,7 +406,6 @@ static struct cdevsw sio_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_TTY | D_KQFILTER,
-	/* bmaj */	-1,
 	/* kqfilter */	ttykqfilter,
 };
 
diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c
index 7d7671d9419b..f5161a6f4eb3 100644
--- a/sys/dev/cy/cy_isa.c
+++ b/sys/dev/cy/cy_isa.c
@@ -406,7 +406,6 @@ static struct cdevsw sio_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_TTY | D_KQFILTER,
-	/* bmaj */	-1,
 	/* kqfilter */	ttykqfilter,
 };
 
diff --git a/sys/dev/dgb/dgb.c b/sys/dev/dgb/dgb.c
index 818aad7a8bbd..c675485c814b 100644
--- a/sys/dev/dgb/dgb.c
+++ b/sys/dev/dgb/dgb.c
@@ -256,7 +256,6 @@ static struct cdevsw dgb_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_TTY | D_KQFILTER,
-	/* bmaj */	-1,
 	/* kqfilter */	ttykqfilter,
 };
 
diff --git a/sys/dev/dgb/dgm.c b/sys/dev/dgb/dgm.c
index 0e0bcfed9907..2951e96bfb22 100644
--- a/sys/dev/dgb/dgm.c
+++ b/sys/dev/dgb/dgm.c
@@ -259,7 +259,6 @@ static struct cdevsw dgm_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_TTY | D_KQFILTER,
-	/* bmaj */	-1,
 	/* kqfilter */	ttykqfilter,
 };
 
diff --git a/sys/dev/dpt/dpt_control.c b/sys/dev/dpt/dpt_control.c
index ef3ddf265049..15dab4113f33 100644
--- a/sys/dev/dpt/dpt_control.c
+++ b/sys/dev/dpt/dpt_control.c
@@ -106,7 +106,6 @@ static struct cdevsw dpt_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 static struct buf *dpt_inbuf[DPT_MAX_ADAPTERS];
diff --git a/sys/dev/fb/fb.c b/sys/dev/fb/fb.c
index c729e0fd98f3..3d927617369c 100644
--- a/sys/dev/fb/fb.c
+++ b/sys/dev/fb/fb.c
@@ -372,7 +372,6 @@ static struct cdevsw fb_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index 04bffb044e81..4b7789b895bf 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.c
@@ -315,7 +315,6 @@ static	d_ioctl_t	fdioctl;
 static	d_strategy_t	fdstrategy;
 
 #define CDEV_MAJOR 9
-#define BDEV_MAJOR 2
 
 static struct cdevsw fd_cdevsw = {
 	/* open */	Fdopen,
@@ -331,7 +330,6 @@ static struct cdevsw fd_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_DISK,
-	/* bmaj */	BDEV_MAJOR
 };
 
 static int
diff --git a/sys/dev/hfa/fore_load.c b/sys/dev/hfa/fore_load.c
index d7d7def5b925..f50e031352c4 100644
--- a/sys/dev/hfa/fore_load.c
+++ b/sys/dev/hfa/fore_load.c
@@ -550,7 +550,6 @@ static struct cdevsw fore_cdev = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 
diff --git a/sys/dev/ida/ida_disk.c b/sys/dev/ida/ida_disk.c
index 257cc30b0c78..f307c68c0e83 100644
--- a/sys/dev/ida/ida_disk.c
+++ b/sys/dev/ida/ida_disk.c
@@ -65,7 +65,6 @@ static	d_close_t	idad_close;
 static	d_strategy_t	idad_strategy;
 static	d_dump_t	idad_dump;
 
-#define IDAD_BDEV_MAJOR	29
 #define IDAD_CDEV_MAJOR	109
 
 static struct cdevsw id_cdevsw = {
@@ -82,7 +81,6 @@ static struct cdevsw id_cdevsw = {
 	/* dump */	idad_dump,
 	/* psize */ 	nopsize,
 	/* flags */	D_DISK,
-	/* bmaj */	IDAD_BDEV_MAJOR
 };
 
 static devclass_t	idad_devclass;
diff --git a/sys/dev/iicbus/iic.c b/sys/dev/iicbus/iic.c
index e8e5f96cc632..1f07f25590cf 100644
--- a/sys/dev/iicbus/iic.c
+++ b/sys/dev/iicbus/iic.c
@@ -103,7 +103,6 @@ static struct cdevsw iic_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 /*
diff --git a/sys/dev/joy/joy.c b/sys/dev/joy/joy.c
index b12e201553af..55ff62cba3d5 100644
--- a/sys/dev/joy/joy.c
+++ b/sys/dev/joy/joy.c
@@ -93,7 +93,6 @@ static struct cdevsw joy_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 devclass_t joy_devclass;
diff --git a/sys/dev/kbd/kbd.c b/sys/dev/kbd/kbd.c
index 777e6f144126..8ebba7ee29d2 100644
--- a/sys/dev/kbd/kbd.c
+++ b/sys/dev/kbd/kbd.c
@@ -435,7 +435,6 @@ static struct cdevsw kbd_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 int
diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c
index 837b4ce1b623..6f8c0f7dd594 100644
--- a/sys/dev/mcd/mcd.c
+++ b/sys/dev/mcd/mcd.c
@@ -209,9 +209,6 @@ static	d_psize_t	mcdsize;
 static	d_strategy_t	mcdstrategy;
 
 #define CDEV_MAJOR 29
-#define BDEV_MAJOR 7
-
-
 
 static struct cdevsw mcd_cdevsw = {
 	/* open */	mcdopen,
@@ -227,7 +224,6 @@ static struct cdevsw mcd_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_DISK,
-	/* bmaj */	BDEV_MAJOR
 };
 
 #define mcd_put(port,byte)	outb(port,byte)
diff --git a/sys/dev/mlx/mlx.c b/sys/dev/mlx/mlx.c
index 291618ad0652..fe2dc3153b20 100644
--- a/sys/dev/mlx/mlx.c
+++ b/sys/dev/mlx/mlx.c
@@ -69,7 +69,6 @@ static struct cdevsw mlx_cdevsw = {
 		/* dump */	nodump,
 		/* psize */ 	nopsize,
 		/* flags */	0,
-		/* bmaj */	-1
 };
 
 devclass_t	mlx_devclass;
diff --git a/sys/dev/mlx/mlx_disk.c b/sys/dev/mlx/mlx_disk.c
index 3f19514e798b..365ac45057ad 100644
--- a/sys/dev/mlx/mlx_disk.c
+++ b/sys/dev/mlx/mlx_disk.c
@@ -58,7 +58,6 @@ static	d_close_t	mlxd_close;
 static	d_strategy_t	mlxd_strategy;
 static	d_ioctl_t	mlxd_ioctl;
 
-#define MLXD_BDEV_MAJOR	27
 #define MLXD_CDEV_MAJOR	131
 
 static struct cdevsw mlxd_cdevsw = {
@@ -75,7 +74,6 @@ static struct cdevsw mlxd_cdevsw = {
 		/* dump */	nodump,
 		/* psize */ 	nopsize,
 		/* flags */	D_DISK,
-		/* bmaj */	MLXD_BDEV_MAJOR
 };
 
 devclass_t		mlxd_devclass;
diff --git a/sys/dev/mse/mse.c b/sys/dev/mse/mse.c
index 926857482aec..7d5468265b40 100644
--- a/sys/dev/mse/mse.c
+++ b/sys/dev/mse/mse.c
@@ -153,7 +153,6 @@ static struct cdevsw mse_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 static	void		mseintr __P((void *));
diff --git a/sys/dev/nmdm/nmdm.c b/sys/dev/nmdm/nmdm.c
index d006ee07d261..b38f60eec189 100644
--- a/sys/dev/nmdm/nmdm.c
+++ b/sys/dev/nmdm/nmdm.c
@@ -80,7 +80,6 @@ static struct cdevsw nmdm_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_TTY,
-	/* bmaj */	-1
 };
 
 #define BUFSIZ 100		/* Chunk size iomoved to/from user */
diff --git a/sys/dev/null/null.c b/sys/dev/null/null.c
index 4ec97a9ea7c5..f7eaa77081f6 100644
--- a/sys/dev/null/null.c
+++ b/sys/dev/null/null.c
@@ -63,7 +63,6 @@ static struct cdevsw null_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 static struct cdevsw zero_cdevsw = {
@@ -80,7 +79,6 @@ static struct cdevsw zero_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_MMAP_ANON,
-	/* bmaj */	-1
 };
 
 static void *zbuf;
diff --git a/sys/dev/pci/pci_user.c b/sys/dev/pci/pci_user.c
index 16990291538e..d8debc39143c 100644
--- a/sys/dev/pci/pci_user.c
+++ b/sys/dev/pci/pci_user.c
@@ -82,7 +82,6 @@ struct cdevsw pcicdev = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
   
 static int
diff --git a/sys/dev/ppbus/lpt.c b/sys/dev/ppbus/lpt.c
index 076b808af9f7..20fc81600ae3 100644
--- a/sys/dev/ppbus/lpt.c
+++ b/sys/dev/ppbus/lpt.c
@@ -202,7 +202,6 @@ static struct cdevsw lpt_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 static int
diff --git a/sys/dev/ppbus/pcfclock.c b/sys/dev/ppbus/pcfclock.c
index 91a516d1a006..2db7f969cd61 100644
--- a/sys/dev/ppbus/pcfclock.c
+++ b/sys/dev/ppbus/pcfclock.c
@@ -81,7 +81,6 @@ static struct cdevsw pcfclock_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 #ifndef PCFCLOCK_MAX_RETRIES
diff --git a/sys/dev/ppbus/ppi.c b/sys/dev/ppbus/ppi.c
index 9c7eca66643d..5e851f0df23f 100644
--- a/sys/dev/ppbus/ppi.c
+++ b/sys/dev/ppbus/ppi.c
@@ -103,7 +103,6 @@ static struct cdevsw ppi_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 #ifdef PERIPH_1284
diff --git a/sys/dev/ppbus/pps.c b/sys/dev/ppbus/pps.c
index b8560a7bbbd2..c79d965f2c88 100644
--- a/sys/dev/ppbus/pps.c
+++ b/sys/dev/ppbus/pps.c
@@ -72,7 +72,6 @@ static struct cdevsw pps_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 static void
diff --git a/sys/dev/random/randomdev.c b/sys/dev/random/randomdev.c
index 4a6aeb8f7ed0..252662df9cca 100644
--- a/sys/dev/random/randomdev.c
+++ b/sys/dev/random/randomdev.c
@@ -75,7 +75,6 @@ static struct cdevsw random_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 static void random_kthread(void *);
diff --git a/sys/dev/rc/rc.c b/sys/dev/rc/rc.c
index 6c1ca5d4aaca..15076fbdf635 100644
--- a/sys/dev/rc/rc.c
+++ b/sys/dev/rc/rc.c
@@ -108,7 +108,6 @@ static struct cdevsw rc_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_TTY | D_KQFILTER,
-	/* bmaj */	-1,
 	/* kqfilter */	ttykqfilter,
 };
 
diff --git a/sys/dev/rp/rp.c b/sys/dev/rp/rp.c
index d3a3399107da..f9391f3fa2a6 100644
--- a/sys/dev/rp/rp.c
+++ b/sys/dev/rp/rp.c
@@ -583,7 +583,6 @@ struct cdevsw rp_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_TTY,
-	/* bmaj */	-1
 };
 
 static int	rp_num_ports_open = 0;
diff --git a/sys/dev/scd/scd.c b/sys/dev/scd/scd.c
index fd3a54d10b02..1ab5aface3aa 100644
--- a/sys/dev/scd/scd.c
+++ b/sys/dev/scd/scd.c
@@ -185,7 +185,7 @@ static	d_ioctl_t	scdioctl;
 static	d_strategy_t	scdstrategy;
 
 #define CDEV_MAJOR 45
-#define BDEV_MAJOR 16
+
 static struct cdevsw scd_cdevsw = {
 	/* open */	scdopen,
 	/* close */	scdclose,
@@ -200,7 +200,6 @@ static struct cdevsw scd_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_DISK,
-	/* bmaj */	BDEV_MAJOR
 };
 
 
diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c
index 615c6d8a00f5..0f4269237364 100644
--- a/sys/dev/si/si.c
+++ b/sys/dev/si/si.c
@@ -130,7 +130,6 @@ static struct cdevsw si_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_TTY | D_KQFILTER,
-	/* bmaj */	-1,
 	/* kqfilter */	ttykqfilter,
 };
 
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index 3f56ab9f9c35..d1a876b44487 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -389,7 +389,6 @@ static struct cdevsw sio_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_TTY | D_KQFILTER,
-	/* bmaj */	-1,
 	/* kqfilter */	ttykqfilter,
 };
 
diff --git a/sys/dev/smbus/smb.c b/sys/dev/smbus/smb.c
index 3b40de1a5360..7eac3cc9702c 100644
--- a/sys/dev/smbus/smb.c
+++ b/sys/dev/smbus/smb.c
@@ -104,7 +104,6 @@ static struct cdevsw smb_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 /*
diff --git a/sys/dev/snp/snp.c b/sys/dev/snp/snp.c
index 3744928db27e..442eafdc948f 100644
--- a/sys/dev/snp/snp.c
+++ b/sys/dev/snp/snp.c
@@ -52,7 +52,6 @@ static struct cdevsw snp_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 
diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c
index ce272e06fc01..ad6280451b03 100644
--- a/sys/dev/sound/midi/midi.c
+++ b/sys/dev/sound/midi/midi.c
@@ -83,7 +83,6 @@ static struct cdevsw midi_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 /*
diff --git a/sys/dev/sound/midi/sequencer.c b/sys/dev/sound/midi/sequencer.c
index 34995d61c288..d8beba23d4ab 100644
--- a/sys/dev/sound/midi/sequencer.c
+++ b/sys/dev/sound/midi/sequencer.c
@@ -158,7 +158,6 @@ static struct cdevsw seq_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 static TAILQ_HEAD(,_seqdev_info) seq_info;
diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c
index 0cf266f63d31..a3039e31fe6b 100644
--- a/sys/dev/sound/pcm/sound.c
+++ b/sys/dev/sound/pcm/sound.c
@@ -58,7 +58,6 @@ static struct cdevsw snd_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_TRACKCLOSE,
-	/* bmaj */	-1
 };
 
 /*
diff --git a/sys/dev/speaker/spkr.c b/sys/dev/speaker/spkr.c
index 776a9c6b8448..ad9dc3e9784b 100644
--- a/sys/dev/speaker/spkr.c
+++ b/sys/dev/speaker/spkr.c
@@ -42,7 +42,6 @@ static struct cdevsw spkr_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 static MALLOC_DEFINE(M_SPKR, "spkr", "Speaker buffer");
diff --git a/sys/dev/streams/streams.c b/sys/dev/streams/streams.c
index 8f279da0cf1b..b1ccc35337d3 100644
--- a/sys/dev/streams/streams.c
+++ b/sys/dev/streams/streams.c
@@ -118,7 +118,6 @@ static struct cdevsw streams_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
  
 struct streams_softc {
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index af7fd9484042..6d0840025b89 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -212,7 +212,6 @@ static struct cdevsw sc_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_TTY,
-	/* bmaj */	-1
 };
 
 int
diff --git a/sys/dev/syscons/sysmouse.c b/sys/dev/syscons/sysmouse.c
index 34f914b77dcb..60082e0dbc99 100644
--- a/sys/dev/syscons/sysmouse.c
+++ b/sys/dev/syscons/sysmouse.c
@@ -61,7 +61,6 @@ static struct cdevsw sm_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_TTY,
-	/* bmaj */	-1
 };
 
 /* local variables */
diff --git a/sys/dev/tdfx/tdfx_pci.c b/sys/dev/tdfx/tdfx_pci.c
index abee7e90932d..7ffee6fcac64 100644
--- a/sys/dev/tdfx/tdfx_pci.c
+++ b/sys/dev/tdfx/tdfx_pci.c
@@ -117,7 +117,6 @@ static struct cdevsw tdfx_cdev = {
 	nodump,			/* dump */
 	nopsize,			/* size */
 	0,					/* flags (no set flags) */
-	-1 				/* bmaj (no block dev) */
 };
 
 static int
diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c
index d318f13e6e9b..7e935d7ea10f 100644
--- a/sys/dev/usb/ugen.c
+++ b/sys/dev/usb/ugen.c
@@ -147,7 +147,6 @@ Static struct cdevsw ugen_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 #endif
 
diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c
index f413c3bc48b5..d34329ea7bf7 100644
--- a/sys/dev/usb/uhid.c
+++ b/sys/dev/usb/uhid.c
@@ -152,7 +152,6 @@ Static struct cdevsw uhid_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 #endif
 
diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c
index 78eb779de924..d4b96491807d 100644
--- a/sys/dev/usb/ulpt.c
+++ b/sys/dev/usb/ulpt.c
@@ -138,7 +138,6 @@ Static struct cdevsw ulpt_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 #endif
 
diff --git a/sys/dev/usb/umodem.c b/sys/dev/usb/umodem.c
index b715c5ee0590..6d4aa160d163 100644
--- a/sys/dev/usb/umodem.c
+++ b/sys/dev/usb/umodem.c
@@ -172,7 +172,6 @@ static struct cdevsw umodem_cdevsw = {
 	/* dump */      nodump,
 	/* psize */     nopsize,
 	/* flags */     D_TTY | D_KQFILTER,
-	/* bmaj */      -1,
 	/* kqfilter */	ttykqfilter,
 };
 #endif
diff --git a/sys/dev/usb/ums.c b/sys/dev/usb/ums.c
index 16327823f210..c3ac612f3d3c 100644
--- a/sys/dev/usb/ums.c
+++ b/sys/dev/usb/ums.c
@@ -158,7 +158,6 @@ Static struct cdevsw ums_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 USB_DECLARE_DRIVER(ums);
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index 5382ec0f2849..338871af4407 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -147,7 +147,6 @@ struct cdevsw usb_cdevsw = {
 	/* dump */      nodump,
 	/* psize */     nopsize,
 	/* flags */     0,
-	/* bmaj */      -1
 };
 #endif
 
diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c
index 18b7aebf9148..d3ff321d011b 100644
--- a/sys/dev/usb/uscanner.c
+++ b/sys/dev/usb/uscanner.c
@@ -220,7 +220,6 @@ Static struct cdevsw uscanner_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 #endif
 
diff --git a/sys/dev/vinum/vinum.c b/sys/dev/vinum/vinum.c
index 4b7089c800a6..366a822e4192 100644
--- a/sys/dev/vinum/vinum.c
+++ b/sys/dev/vinum/vinum.c
@@ -58,7 +58,7 @@ struct cdevsw vinum_cdevsw =
     vinumopen, vinumclose, physread, physwrite,
     vinumioctl, seltrue, nommap, vinumstrategy,
     "vinum", VINUM_CDEV_MAJOR, vinumdump, vinumsize,
-    D_DISK, VINUM_BDEV_MAJOR
+    D_DISK
 };
 
 /* Called by main() during pseudo-device attachment. */
diff --git a/sys/dev/vinum/vinumvar.h b/sys/dev/vinum/vinumvar.h
index 44a9c8b978ef..eb3e4c2b0095 100644
--- a/sys/dev/vinum/vinumvar.h
+++ b/sys/dev/vinum/vinumvar.h
@@ -59,7 +59,6 @@ enum constants {
     MINVINUMSLICE = 1048576,				    /* minimum size of a slice */
 
     VINUM_CDEV_MAJOR = 91,				    /* major number for character device */
-    VINUM_BDEV_MAJOR = 25,				    /* and legacy major number for block device */
 
     ROUND_ROBIN_READPOL = -1,				    /* round robin read policy */
 
@@ -131,8 +130,6 @@ enum constants {
 			     << (VINUM_PLEX_SHIFT + VINUM_VOL_WIDTH))		\
 			  | (t << VINUM_TYPE_SHIFT) )
 
-#define VINUMRBDEV(d,t)	makedev (VINUM_BDEV_MAJOR, VINUMRMINOR (d, t))
-
     /* extract device type */
 #define DEVTYPE(x) ((minor (x) >> VINUM_TYPE_SHIFT) & 7)
 
diff --git a/sys/fs/coda/coda_fbsd.c b/sys/fs/coda/coda_fbsd.c
index 76dc62ed1bad..8111691c6c14 100644
--- a/sys/fs/coda/coda_fbsd.c
+++ b/sys/fs/coda/coda_fbsd.c
@@ -78,7 +78,6 @@ static struct cdevsw codadevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 int     vcdebug = 1;
diff --git a/sys/geom/geom_ccd.c b/sys/geom/geom_ccd.c
index 13964a39276c..57067f2966ff 100644
--- a/sys/geom/geom_ccd.c
+++ b/sys/geom/geom_ccd.c
@@ -167,7 +167,6 @@ static d_psize_t ccdsize;
 #define NCCDFREEHIWAT	16
 
 #define CDEV_MAJOR 74
-#define BDEV_MAJOR 21
 
 static struct cdevsw ccd_cdevsw = {
 	/* open */	ccdopen,
@@ -183,7 +182,6 @@ static struct cdevsw ccd_cdevsw = {
 	/* dump */	ccddump,
 	/* psize */	ccdsize,
 	/* flags */	D_DISK,
-	/* bmaj */	BDEV_MAJOR
 };
 
 /* called during module initialization */
diff --git a/sys/i386/apm/apm.c b/sys/i386/apm/apm.c
index 26a8d0634abe..4d8f188e0a10 100644
--- a/sys/i386/apm/apm.c
+++ b/sys/i386/apm/apm.c
@@ -97,7 +97,6 @@ static struct cdevsw apm_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 static int apm_suspend_delay = 1;
diff --git a/sys/i386/bios/apm.c b/sys/i386/bios/apm.c
index 26a8d0634abe..4d8f188e0a10 100644
--- a/sys/i386/bios/apm.c
+++ b/sys/i386/bios/apm.c
@@ -97,7 +97,6 @@ static struct cdevsw apm_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 static int apm_suspend_delay = 1;
diff --git a/sys/i386/i386/mem.c b/sys/i386/i386/mem.c
index 7b6baff08937..a5a913506527 100644
--- a/sys/i386/i386/mem.c
+++ b/sys/i386/i386/mem.c
@@ -89,7 +89,6 @@ static struct cdevsw mem_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_MEM,
-	/* bmaj */	-1
 };
 
 MALLOC_DEFINE(M_MEMDESC, "memdesc", "memory range descriptors");
diff --git a/sys/i386/i386/perfmon.c b/sys/i386/i386/perfmon.c
index 2efa51642d85..435cc2ff9e32 100644
--- a/sys/i386/i386/perfmon.c
+++ b/sys/i386/i386/perfmon.c
@@ -73,7 +73,6 @@ static struct cdevsw perfmon_cdevsw = {
 	/* dump */      nodump,
 	/* psize */     nopsize,
 	/* flags */     0,
-	/* bmaj */      -1
 };
 
 /*
diff --git a/sys/i386/isa/asc.c b/sys/i386/isa/asc.c
index b3e7b8dcd2cf..2cc081e445da 100644
--- a/sys/i386/isa/asc.c
+++ b/sys/i386/isa/asc.c
@@ -211,7 +211,6 @@ static struct cdevsw asc_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 #define STATIC static
diff --git a/sys/i386/isa/ctx.c b/sys/i386/isa/ctx.c
index b8a2ea2e983f..9a387fceaa42 100644
--- a/sys/i386/isa/ctx.c
+++ b/sys/i386/isa/ctx.c
@@ -164,7 +164,6 @@ static struct cdevsw ctx_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 
diff --git a/sys/i386/isa/cx.c b/sys/i386/isa/cx.c
index 1ec334b53799..1c473e92a5ae 100644
--- a/sys/i386/isa/cx.c
+++ b/sys/i386/isa/cx.c
@@ -101,7 +101,6 @@ struct cdevsw cx_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_TTY | D_KQFILTER,
-	/* bmaj */	-1,
 	/* kqfilter */	ttykqfilter,
 };
 #else
diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c
index 7d7671d9419b..f5161a6f4eb3 100644
--- a/sys/i386/isa/cy.c
+++ b/sys/i386/isa/cy.c
@@ -406,7 +406,6 @@ static struct cdevsw sio_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_TTY | D_KQFILTER,
-	/* bmaj */	-1,
 	/* kqfilter */	ttykqfilter,
 };
 
diff --git a/sys/i386/isa/gpib.c b/sys/i386/isa/gpib.c
index 1463373c622e..8792395051fa 100644
--- a/sys/i386/isa/gpib.c
+++ b/sys/i386/isa/gpib.c
@@ -91,7 +91,6 @@ static struct cdevsw gp_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 #define   BUFSIZE      1024
diff --git a/sys/i386/isa/gsc.c b/sys/i386/isa/gsc.c
index dd2925dd0ab9..8d7ded32384a 100644
--- a/sys/i386/isa/gsc.c
+++ b/sys/i386/isa/gsc.c
@@ -208,7 +208,6 @@ static struct cdevsw gsc_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 
diff --git a/sys/i386/isa/istallion.c b/sys/i386/isa/istallion.c
index 41f66be833a3..b8ba4dbce6f0 100644
--- a/sys/i386/isa/istallion.c
+++ b/sys/i386/isa/istallion.c
@@ -655,7 +655,6 @@ static struct cdevsw stli_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_TTY | D_KQFILTER,
-	/* bmaj */	-1,
 	/* kqfilter */	ttykqfilter,
 };
 
diff --git a/sys/i386/isa/loran.c b/sys/i386/isa/loran.c
index c43bf8524c24..cedcd0f95f37 100644
--- a/sys/i386/isa/loran.c
+++ b/sys/i386/isa/loran.c
@@ -642,7 +642,6 @@ static struct cdevsw loran_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 #endif /* _KERNEL */
diff --git a/sys/i386/isa/matcd/matcd.c b/sys/i386/isa/matcd/matcd.c
index 9dfae97d3ece..7c3e758c3362 100644
--- a/sys/i386/isa/matcd/matcd.c
+++ b/sys/i386/isa/matcd/matcd.c
@@ -516,7 +516,6 @@ static d_psize_t	matcdsize;
 static d_strategy_t	matcdstrategy;
 
 #define CDEV_MAJOR 46
-#define BDEV_MAJOR 17
 
 static struct cdevsw matcd_cdevsw = {
 	/* open */	matcdopen,
@@ -532,7 +531,6 @@ static struct cdevsw matcd_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_DISK,
-	/* bmaj */	BDEV_MAJOR
 };
 
 /*---------------------------------------------------------------------------
diff --git a/sys/i386/isa/mcd.c b/sys/i386/isa/mcd.c
index 837b4ce1b623..6f8c0f7dd594 100644
--- a/sys/i386/isa/mcd.c
+++ b/sys/i386/isa/mcd.c
@@ -209,9 +209,6 @@ static	d_psize_t	mcdsize;
 static	d_strategy_t	mcdstrategy;
 
 #define CDEV_MAJOR 29
-#define BDEV_MAJOR 7
-
-
 
 static struct cdevsw mcd_cdevsw = {
 	/* open */	mcdopen,
@@ -227,7 +224,6 @@ static struct cdevsw mcd_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_DISK,
-	/* bmaj */	BDEV_MAJOR
 };
 
 #define mcd_put(port,byte)	outb(port,byte)
diff --git a/sys/i386/isa/mse.c b/sys/i386/isa/mse.c
index 926857482aec..7d5468265b40 100644
--- a/sys/i386/isa/mse.c
+++ b/sys/i386/isa/mse.c
@@ -153,7 +153,6 @@ static struct cdevsw mse_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 static	void		mseintr __P((void *));
diff --git a/sys/i386/isa/pcaudio.c b/sys/i386/isa/pcaudio.c
index f4a9a4b4e6df..1e4d4e9a2448 100644
--- a/sys/i386/isa/pcaudio.c
+++ b/sys/i386/isa/pcaudio.c
@@ -169,7 +169,6 @@ static struct cdevsw pca_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 static void pca_continue __P((void));
diff --git a/sys/i386/isa/pcvt/pcvt_drv.c b/sys/i386/isa/pcvt/pcvt_drv.c
index eddc14ac5e85..3c1cdea16099 100644
--- a/sys/i386/isa/pcvt/pcvt_drv.c
+++ b/sys/i386/isa/pcvt/pcvt_drv.c
@@ -109,7 +109,6 @@ static struct cdevsw vt_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_TTY | D_KQFILTER,
-	/* bmaj */	-1,
 	/* kqfilter */	ttykqfilter,
 };
 
diff --git a/sys/i386/isa/rc.c b/sys/i386/isa/rc.c
index 6c1ca5d4aaca..15076fbdf635 100644
--- a/sys/i386/isa/rc.c
+++ b/sys/i386/isa/rc.c
@@ -108,7 +108,6 @@ static struct cdevsw rc_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_TTY | D_KQFILTER,
-	/* bmaj */	-1,
 	/* kqfilter */	ttykqfilter,
 };
 
diff --git a/sys/i386/isa/rp.c b/sys/i386/isa/rp.c
index 2740470d9796..b3e5477c15a0 100644
--- a/sys/i386/isa/rp.c
+++ b/sys/i386/isa/rp.c
@@ -817,7 +817,6 @@ static struct cdevsw rp_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_TTY | D_KQFILTER,
-	/* bmaj */	-1,
 	/* kqfilter */	ttykqfilter,
 };
 
diff --git a/sys/i386/isa/scd.c b/sys/i386/isa/scd.c
index fd3a54d10b02..1ab5aface3aa 100644
--- a/sys/i386/isa/scd.c
+++ b/sys/i386/isa/scd.c
@@ -185,7 +185,7 @@ static	d_ioctl_t	scdioctl;
 static	d_strategy_t	scdstrategy;
 
 #define CDEV_MAJOR 45
-#define BDEV_MAJOR 16
+
 static struct cdevsw scd_cdevsw = {
 	/* open */	scdopen,
 	/* close */	scdclose,
@@ -200,7 +200,6 @@ static struct cdevsw scd_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_DISK,
-	/* bmaj */	BDEV_MAJOR
 };
 
 
diff --git a/sys/i386/isa/spic.c b/sys/i386/isa/spic.c
index ebf37effe197..9593d73579a5 100644
--- a/sys/i386/isa/spic.c
+++ b/sys/i386/isa/spic.c
@@ -98,7 +98,6 @@ static struct cdevsw spic_cdevsw = {
         /* dump */      nodump,
         /* psize */     nopsize,
         /* flags */     0,
-        /* bmaj */      -1
 };
 
 #define SCBUFLEN 128
diff --git a/sys/i386/isa/spigot.c b/sys/i386/isa/spigot.c
index 96272df2dc51..bd4746729c99 100644
--- a/sys/i386/isa/spigot.c
+++ b/sys/i386/isa/spigot.c
@@ -117,7 +117,6 @@ static struct cdevsw spigot_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 static ointhand2_t	spigintr;
diff --git a/sys/i386/isa/spkr.c b/sys/i386/isa/spkr.c
index 776a9c6b8448..ad9dc3e9784b 100644
--- a/sys/i386/isa/spkr.c
+++ b/sys/i386/isa/spkr.c
@@ -42,7 +42,6 @@ static struct cdevsw spkr_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 static MALLOC_DEFINE(M_SPKR, "spkr", "Speaker buffer");
diff --git a/sys/i386/isa/stallion.c b/sys/i386/isa/stallion.c
index 9a4ee7f62606..b77ec9686333 100644
--- a/sys/i386/isa/stallion.c
+++ b/sys/i386/isa/stallion.c
@@ -553,7 +553,6 @@ static struct cdevsw stl_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_TTY | D_KQFILTER,
-	/* bmaj */	-1,
 	/* kqfilter */	ttykqfilter,
 };
 
diff --git a/sys/i386/isa/tw.c b/sys/i386/isa/tw.c
index 037e9431045a..4b9c458e5e2b 100644
--- a/sys/i386/isa/tw.c
+++ b/sys/i386/isa/tw.c
@@ -240,7 +240,6 @@ static struct cdevsw tw_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 /*
diff --git a/sys/i386/isa/wt.c b/sys/i386/isa/wt.c
index 2f177cbffcea..0adf3c809d4d 100644
--- a/sys/i386/isa/wt.c
+++ b/sys/i386/isa/wt.c
@@ -199,7 +199,6 @@ static struct cdevsw wt_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 
diff --git a/sys/i4b/driver/i4b_ctl.c b/sys/i4b/driver/i4b_ctl.c
index 87ccfe7f6644..b30f792e6276 100644
--- a/sys/i4b/driver/i4b_ctl.c
+++ b/sys/i4b/driver/i4b_ctl.c
@@ -118,7 +118,6 @@ static struct cdevsw i4bctl_cdevsw = {
 	/* dump */      nodump,
 	/* psize */     nopsize,
 	/* flags */     0,
-	/* bmaj */      -1
 };
 #else
 static struct cdevsw i4bctl_cdevsw = 
diff --git a/sys/i4b/driver/i4b_rbch.c b/sys/i4b/driver/i4b_rbch.c
index 86644cc7b61a..14754282ce17 100644
--- a/sys/i4b/driver/i4b_rbch.c
+++ b/sys/i4b/driver/i4b_rbch.c
@@ -203,7 +203,6 @@ static struct cdevsw i4brbch_cdevsw = {
 	/* dump */      nodump,
 	/* psize */     nopsize,
 	/* flags */     0,
-	/* bmaj */      -1
 };
 
 static void i4brbchattach(void *);
diff --git a/sys/i4b/driver/i4b_tel.c b/sys/i4b/driver/i4b_tel.c
index 4ebe7162fede..48ddb55fa5a6 100644
--- a/sys/i4b/driver/i4b_tel.c
+++ b/sys/i4b/driver/i4b_tel.c
@@ -207,7 +207,6 @@ static struct cdevsw i4btel_cdevsw = {
 	/* dump */      nodump,
 	/* psize */     nopsize,
 	/* flags */     0,
-	/* bmaj */      -1
 };
 
 PDEVSTATIC void i4btelinit(void *unused);
diff --git a/sys/i4b/driver/i4b_trace.c b/sys/i4b/driver/i4b_trace.c
index 7be9cfcd2cea..a9ad351a1946 100644
--- a/sys/i4b/driver/i4b_trace.c
+++ b/sys/i4b/driver/i4b_trace.c
@@ -143,7 +143,6 @@ static struct cdevsw i4btrc_cdevsw = {
         /* dump */      nodump,
         /* psize */     nopsize,
         /* flags */     0,
-        /* bmaj */      -1
 };
 
 /*---------------------------------------------------------------------------*
diff --git a/sys/i4b/layer4/i4b_i4bdrv.c b/sys/i4b/layer4/i4b_i4bdrv.c
index 156260ef1ec7..29620ad2cbae 100644
--- a/sys/i4b/layer4/i4b_i4bdrv.c
+++ b/sys/i4b/layer4/i4b_i4bdrv.c
@@ -184,7 +184,6 @@ static struct cdevsw i4b_cdevsw = {
 	/* dump */      nodump,
 	/* psize */     nopsize,
 	/* flags */     0,
-	/* bmaj */      -1
 };
 #else
 static struct cdevsw i4b_cdevsw = {
diff --git a/sys/ia64/ia64/mem.c b/sys/ia64/ia64/mem.c
index 1522ecfdbe4d..15433f9a33ee 100644
--- a/sys/ia64/ia64/mem.c
+++ b/sys/ia64/ia64/mem.c
@@ -92,7 +92,6 @@ static struct cdevsw mem_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_MEM,
-	/* bmaj */	-1
 };
 
 struct mem_range_softc mem_range_softc;
diff --git a/sys/ia64/ia64/ssc.c b/sys/ia64/ia64/ssc.c
index f5bdaf5afaa0..6fc59a8a882b 100644
--- a/sys/ia64/ia64/ssc.c
+++ b/sys/ia64/ia64/ssc.c
@@ -71,7 +71,6 @@ static struct cdevsw ssc_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 static struct tty *ssc_tp = NULL;
diff --git a/sys/ia64/ia64/sscdisk.c b/sys/ia64/ia64/sscdisk.c
index cb3c93cfd9c0..4a9cff0c3b4e 100644
--- a/sys/ia64/ia64/sscdisk.c
+++ b/sys/ia64/ia64/sscdisk.c
@@ -80,7 +80,6 @@ SYSCTL_INT(_debug, OID_AUTO, mddebug, CTLFLAG_RW, &ssc_debug, 0, "");
 static int sscrootready;
 
 #define CDEV_MAJOR	157
-#define BDEV_MAJOR	157
 
 static d_strategy_t sscstrategy;
 static d_open_t sscopen;
@@ -100,7 +99,6 @@ static struct cdevsw ssc_cdevsw = {
         /* dump */      nodump,
         /* psize */     nopsize,
         /* flags */     D_DISK | D_CANFREE,
-        /* bmaj */      BDEV_MAJOR
 };
 
 static struct cdevsw sscdisk_cdevsw;
diff --git a/sys/isa/fd.c b/sys/isa/fd.c
index 04bffb044e81..4b7789b895bf 100644
--- a/sys/isa/fd.c
+++ b/sys/isa/fd.c
@@ -315,7 +315,6 @@ static	d_ioctl_t	fdioctl;
 static	d_strategy_t	fdstrategy;
 
 #define CDEV_MAJOR 9
-#define BDEV_MAJOR 2
 
 static struct cdevsw fd_cdevsw = {
 	/* open */	Fdopen,
@@ -331,7 +330,6 @@ static struct cdevsw fd_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_DISK,
-	/* bmaj */	BDEV_MAJOR
 };
 
 static int
diff --git a/sys/isa/joy.c b/sys/isa/joy.c
index b12e201553af..55ff62cba3d5 100644
--- a/sys/isa/joy.c
+++ b/sys/isa/joy.c
@@ -93,7 +93,6 @@ static struct cdevsw joy_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 devclass_t joy_devclass;
diff --git a/sys/isa/psm.c b/sys/isa/psm.c
index 6b670ea72a42..a756073ae38d 100644
--- a/sys/isa/psm.c
+++ b/sys/isa/psm.c
@@ -338,7 +338,6 @@ static struct cdevsw psm_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 /* debug message level */
diff --git a/sys/isa/sio.c b/sys/isa/sio.c
index 3f56ab9f9c35..d1a876b44487 100644
--- a/sys/isa/sio.c
+++ b/sys/isa/sio.c
@@ -389,7 +389,6 @@ static struct cdevsw sio_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_TTY | D_KQFILTER,
-	/* bmaj */	-1,
 	/* kqfilter */	ttykqfilter,
 };
 
diff --git a/sys/isa/vga_isa.c b/sys/isa/vga_isa.c
index 57f934ed6b6e..0cc754a72882 100644
--- a/sys/isa/vga_isa.c
+++ b/sys/isa/vga_isa.c
@@ -82,7 +82,6 @@ static struct cdevsw isavga_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 #endif /* FB_INSTALL_CDEV */
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index 79b8e411f9ee..90023ee9c1a8 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -83,7 +83,6 @@ static struct cdevsw fildesc_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 static int do_dup __P((struct filedesc *fdp, int old, int new, register_t *retval, struct proc *p));
diff --git a/sys/kern/subr_log.c b/sys/kern/subr_log.c
index d63dfb69d5d5..cbf1fd7ed567 100644
--- a/sys/kern/subr_log.c
+++ b/sys/kern/subr_log.c
@@ -80,7 +80,6 @@ static struct cdevsw log_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 static struct logsoftc {
diff --git a/sys/kern/tty_cons.c b/sys/kern/tty_cons.c
index 9aa2c23386d6..a40db4babf0e 100644
--- a/sys/kern/tty_cons.c
+++ b/sys/kern/tty_cons.c
@@ -75,7 +75,6 @@ static struct cdevsw cn_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_TTY | D_KQFILTER,
-	/* bmaj */	-1,
 	/* kqfilter */	cnkqfilter,
 };
 
diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c
index 501dde13bce1..9ff369b0dbd8 100644
--- a/sys/kern/tty_pty.c
+++ b/sys/kern/tty_pty.c
@@ -87,7 +87,6 @@ static struct cdevsw pts_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_TTY | D_KQFILTER,
-	/* bmaj */	-1,
 	/* kqfilter */	ttykqfilter,
 };
 
@@ -106,7 +105,6 @@ static struct cdevsw ptc_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_TTY | D_KQFILTER,
-	/* bmaj */	-1,
 	/* kqfilter */	ttykqfilter,
 };
 
diff --git a/sys/kern/tty_snoop.c b/sys/kern/tty_snoop.c
index 3744928db27e..442eafdc948f 100644
--- a/sys/kern/tty_snoop.c
+++ b/sys/kern/tty_snoop.c
@@ -52,7 +52,6 @@ static struct cdevsw snp_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 
diff --git a/sys/kern/tty_tty.c b/sys/kern/tty_tty.c
index 66f7a7bd8236..5ad470bad483 100644
--- a/sys/kern/tty_tty.c
+++ b/sys/kern/tty_tty.c
@@ -69,7 +69,6 @@ struct cdevsw ctty_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_TTY,
-	/* bmaj */	-1
 };
 
 #define cttyvp(p) ((p)->p_flag & P_CONTROLT ? (p)->p_session->s_ttyvp : NULL)
diff --git a/sys/net/bpf.c b/sys/net/bpf.c
index 6ad19d927a2a..74a8c5bbd0ff 100644
--- a/sys/net/bpf.c
+++ b/sys/net/bpf.c
@@ -129,7 +129,6 @@ static struct cdevsw bpf_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 
diff --git a/sys/net/if_tap.c b/sys/net/if_tap.c
index 5d7ce75e02da..b2542d122e1f 100644
--- a/sys/net/if_tap.c
+++ b/sys/net/if_tap.c
@@ -109,7 +109,6 @@ static struct cdevsw	tap_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 static int		taprefcnt = 0;		/* module ref. counter   */
diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index 51ef884779b6..78fd0f1c0e66 100644
--- a/sys/net/if_tun.c
+++ b/sys/net/if_tun.c
@@ -87,7 +87,6 @@ static struct cdevsw tun_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 static void tun_clone __P((void *arg, char *name, int namelen, dev_t *dev));
diff --git a/sys/netinet/mlfk_ipl.c b/sys/netinet/mlfk_ipl.c
index 7a7971fff364..2a51d7dc002a 100644
--- a/sys/netinet/mlfk_ipl.c
+++ b/sys/netinet/mlfk_ipl.c
@@ -114,7 +114,6 @@ static struct cdevsw ipl_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 static int
diff --git a/sys/pc98/apm/apm.c b/sys/pc98/apm/apm.c
index 1184c1bc4838..cd0e66f3af55 100644
--- a/sys/pc98/apm/apm.c
+++ b/sys/pc98/apm/apm.c
@@ -115,7 +115,6 @@ static struct cdevsw apm_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 static int apm_suspend_delay = 1;
diff --git a/sys/pc98/cbus/fdc.c b/sys/pc98/cbus/fdc.c
index 1b21f64c04a6..8b9b18ec2483 100644
--- a/sys/pc98/cbus/fdc.c
+++ b/sys/pc98/cbus/fdc.c
@@ -420,7 +420,6 @@ static	d_ioctl_t	fdioctl;
 static	d_strategy_t	fdstrategy;
 
 #define CDEV_MAJOR 9
-#define BDEV_MAJOR 2
 
 static struct cdevsw fd_cdevsw = {
 	/* open */	Fdopen,
@@ -436,7 +435,6 @@ static struct cdevsw fd_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_DISK,
-	/* bmaj */	BDEV_MAJOR
 };
 
 static int
diff --git a/sys/pc98/cbus/gdc.c b/sys/pc98/cbus/gdc.c
index dabc1e8d3e50..6547a4e9aef7 100644
--- a/sys/pc98/cbus/gdc.c
+++ b/sys/pc98/cbus/gdc.c
@@ -97,7 +97,6 @@ static struct cdevsw gdc_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 #endif /* FB_INSTALL_CDEV */
diff --git a/sys/pc98/cbus/olpt.c b/sys/pc98/cbus/olpt.c
index a2c7fe64e058..4a6488ca1109 100644
--- a/sys/pc98/cbus/olpt.c
+++ b/sys/pc98/cbus/olpt.c
@@ -314,7 +314,6 @@ static struct cdevsw lpt_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 #ifndef PC98
diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c
index 3ccfdf3ca9a7..7f47f436e087 100644
--- a/sys/pc98/cbus/sio.c
+++ b/sys/pc98/cbus/sio.c
@@ -510,7 +510,6 @@ static struct cdevsw sio_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_TTY | D_KQFILTER,
-	/* bmaj */	-1,
 	/* kqfilter */	ttykqfilter,
 };
 
diff --git a/sys/pc98/pc98/fd.c b/sys/pc98/pc98/fd.c
index 1b21f64c04a6..8b9b18ec2483 100644
--- a/sys/pc98/pc98/fd.c
+++ b/sys/pc98/pc98/fd.c
@@ -420,7 +420,6 @@ static	d_ioctl_t	fdioctl;
 static	d_strategy_t	fdstrategy;
 
 #define CDEV_MAJOR 9
-#define BDEV_MAJOR 2
 
 static struct cdevsw fd_cdevsw = {
 	/* open */	Fdopen,
@@ -436,7 +435,6 @@ static struct cdevsw fd_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_DISK,
-	/* bmaj */	BDEV_MAJOR
 };
 
 static int
diff --git a/sys/pc98/pc98/mse.c b/sys/pc98/pc98/mse.c
index 56eeab93117b..8bf11aec88c7 100644
--- a/sys/pc98/pc98/mse.c
+++ b/sys/pc98/pc98/mse.c
@@ -151,7 +151,6 @@ static struct cdevsw mse_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 static	void		mseintr __P((void *));
diff --git a/sys/pc98/pc98/olpt.c b/sys/pc98/pc98/olpt.c
index a2c7fe64e058..4a6488ca1109 100644
--- a/sys/pc98/pc98/olpt.c
+++ b/sys/pc98/pc98/olpt.c
@@ -314,7 +314,6 @@ static struct cdevsw lpt_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 #ifndef PC98
diff --git a/sys/pc98/pc98/pc98gdc.c b/sys/pc98/pc98/pc98gdc.c
index dabc1e8d3e50..6547a4e9aef7 100644
--- a/sys/pc98/pc98/pc98gdc.c
+++ b/sys/pc98/pc98/pc98gdc.c
@@ -97,7 +97,6 @@ static struct cdevsw gdc_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 #endif /* FB_INSTALL_CDEV */
diff --git a/sys/pc98/pc98/pcaudio.c b/sys/pc98/pc98/pcaudio.c
index fdad7b46d460..e721f1623346 100644
--- a/sys/pc98/pc98/pcaudio.c
+++ b/sys/pc98/pc98/pcaudio.c
@@ -173,7 +173,6 @@ static struct cdevsw pca_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 static void pca_continue __P((void));
diff --git a/sys/pc98/pc98/sio.c b/sys/pc98/pc98/sio.c
index 3ccfdf3ca9a7..7f47f436e087 100644
--- a/sys/pc98/pc98/sio.c
+++ b/sys/pc98/pc98/sio.c
@@ -510,7 +510,6 @@ static struct cdevsw sio_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_TTY | D_KQFILTER,
-	/* bmaj */	-1,
 	/* kqfilter */	ttykqfilter,
 };
 
diff --git a/sys/pc98/pc98/spkr.c b/sys/pc98/pc98/spkr.c
index 0c467eae8af0..f3436d5b5c95 100644
--- a/sys/pc98/pc98/spkr.c
+++ b/sys/pc98/pc98/spkr.c
@@ -51,7 +51,6 @@ static struct cdevsw spkr_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 static MALLOC_DEFINE(M_SPKR, "spkr", "Speaker buffer");
diff --git a/sys/pc98/pc98/syscons.c b/sys/pc98/pc98/syscons.c
index b157f4a62852..54c51dca00ab 100644
--- a/sys/pc98/pc98/syscons.c
+++ b/sys/pc98/pc98/syscons.c
@@ -212,7 +212,6 @@ static struct cdevsw sc_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_TTY,
-	/* bmaj */	-1
 };
 
 int
diff --git a/sys/pc98/pc98/wd.c b/sys/pc98/pc98/wd.c
index 3b96e8171212..a52723384bdb 100644
--- a/sys/pc98/pc98/wd.c
+++ b/sys/pc98/pc98/wd.c
@@ -252,7 +252,6 @@ static	d_open_t	wdopen;
 static	d_strategy_t	wdstrategy;
 
 #define CDEV_MAJOR 3
-#define BDEV_MAJOR 0
 
 static struct cdevsw wd_cdevsw = {
 	/* open */	wdopen,
@@ -268,7 +267,6 @@ static struct cdevsw wd_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_DISK,
-	/* bmaj */	BDEV_MAJOR
 };
 
 static struct cdevsw wddisk_cdevsw;
diff --git a/sys/pc98/pc98/wd_cd.c b/sys/pc98/pc98/wd_cd.c
index f1cca1b73cf2..0de3104e88c0 100644
--- a/sys/pc98/pc98/wd_cd.c
+++ b/sys/pc98/pc98/wd_cd.c
@@ -49,7 +49,7 @@ static d_ioctl_t	acdioctl;
 static d_strategy_t	acdstrategy;
 
 #define CDEV_MAJOR 69
-#define BDEV_MAJOR 19
+
 static struct cdevsw acd_cdevsw = {
 	/* open */	acdopen,
 	/* close */	acdclose,
@@ -64,7 +64,6 @@ static struct cdevsw acd_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_DISK,
-	/* bmaj */	BDEV_MAJOR
 };
 
 #define NUNIT	16		/* Max # of devices */
diff --git a/sys/pc98/pc98/wfd.c b/sys/pc98/pc98/wfd.c
index 2ead84eb2d47..42abf43e7186 100644
--- a/sys/pc98/pc98/wfd.c
+++ b/sys/pc98/pc98/wfd.c
@@ -53,7 +53,6 @@ static	d_ioctl_t	wfdioctl;
 static	d_strategy_t	wfdstrategy;
 
 #define CDEV_MAJOR 87
-#define BDEV_MAJOR 1
 
 static struct cdevsw wfd_cdevsw = {
 	/* open */	wfdopen,
@@ -69,7 +68,6 @@ static struct cdevsw wfd_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_DISK,
-	/* bmaj */	BDEV_MAJOR
 };
 
 int  wfdattach(struct atapi*, int, struct atapi_params*, int);
diff --git a/sys/pc98/pc98/wst.c b/sys/pc98/pc98/wst.c
index 3260471a4a45..4b9b1b3b73cb 100644
--- a/sys/pc98/pc98/wst.c
+++ b/sys/pc98/pc98/wst.c
@@ -63,7 +63,6 @@ static struct cdevsw wst_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 static unsigned int wst_total = 0;
diff --git a/sys/pccard/pccard.c b/sys/pccard/pccard.c
index 6abc14112589..f5f15bfcb8f3 100644
--- a/sys/pccard/pccard.c
+++ b/sys/pccard/pccard.c
@@ -103,7 +103,6 @@ static struct cdevsw crd_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 /*
diff --git a/sys/pci/agp.c b/sys/pci/agp.c
index a9d85bb2c090..6419635a3e98 100644
--- a/sys/pci/agp.c
+++ b/sys/pci/agp.c
@@ -82,7 +82,6 @@ static struct cdevsw agp_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_TTY,
-	/* bmaj */	-1
 };
 
 static devclass_t agp_devclass;
diff --git a/sys/pci/meteor.c b/sys/pci/meteor.c
index 088ca7c79f71..72c69886c4d5 100644
--- a/sys/pci/meteor.c
+++ b/sys/pci/meteor.c
@@ -241,7 +241,6 @@ static struct cdevsw meteor_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 #endif
 
diff --git a/sys/pci/xrpu.c b/sys/pci/xrpu.c
index 3d2332f1156f..a1a8d6c85a5c 100644
--- a/sys/pci/xrpu.c
+++ b/sys/pci/xrpu.c
@@ -57,7 +57,6 @@ static struct cdevsw xrpu_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 static MALLOC_DEFINE(M_XRPU, "xrpu", "XRPU related");
diff --git a/sys/sys/conf.h b/sys/sys/conf.h
index 7f1e85ea4b3c..4d23ac4aee3e 100644
--- a/sys/sys/conf.h
+++ b/sys/sys/conf.h
@@ -199,8 +199,6 @@ struct cdevsw {
 	d_dump_t	*d_dump;
 	d_psize_t	*d_psize;
 	u_int		d_flags;
-	/* This following field is deprecated.  Please don't initialize */
-	int		d_XXXbmaj;
 	/* additions below are not binary compatible with 4.2 and below */
 	d_kqfilter_t	*d_kqfilter;
 };
diff --git a/sys/sys/linedisc.h b/sys/sys/linedisc.h
index 7f1e85ea4b3c..4d23ac4aee3e 100644
--- a/sys/sys/linedisc.h
+++ b/sys/sys/linedisc.h
@@ -199,8 +199,6 @@ struct cdevsw {
 	d_dump_t	*d_dump;
 	d_psize_t	*d_psize;
 	u_int		d_flags;
-	/* This following field is deprecated.  Please don't initialize */
-	int		d_XXXbmaj;
 	/* additions below are not binary compatible with 4.2 and below */
 	d_kqfilter_t	*d_kqfilter;
 };
diff --git a/sys/ufs/mfs/mfs_vfsops.c b/sys/ufs/mfs/mfs_vfsops.c
index 1a5260d0a8d7..ae246d39fe5b 100644
--- a/sys/ufs/mfs/mfs_vfsops.c
+++ b/sys/ufs/mfs/mfs_vfsops.c
@@ -92,7 +92,6 @@ static struct cdevsw mfs_cdevsw = {
 	/* dump */      nodump,
 	/* psize */     nopsize,
 	/* flags */     D_DISK,
-	/* bmaj */      253,
 };
 
 /*