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

the bit-bucket.

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;

sys/alpha/alpha/promcons.c

@@ -77,7 +77,6 @@ static struct cdevsw prom_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 

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 *));

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");

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;

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;
 

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;

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;

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;

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;

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;

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;
 

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,

sys/coda/coda_fbsd.c

@@ -78,7 +78,6 @@ static struct cdevsw codadevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 int     vcdebug = 1;

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;
 

sys/dev/aac/aac.c

@@ -163,7 +163,6 @@ static struct cdevsw aac_cdevsw = {
     nodump,		/* dump */
     nopsize,		/* psize */
     0,			/* flags */
-    -1,			/* bmaj */
 };
 
 /********************************************************************************

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;

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;

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 */
 };
 
 /*

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;

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

sys/dev/ata/ata-all.c

@@ -69,7 +69,6 @@ static struct cdevsw ata_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 /* prototypes */

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;
 

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;
 

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 */

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;
 

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 */

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 */

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);

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 */

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,
 };
 

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,
 };
 

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,
 };
 

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,
 };
 

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];

sys/dev/fb/fb.c

@@ -372,7 +372,6 @@ static struct cdevsw fb_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 

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

sys/dev/hfa/fore_load.c

@@ -550,7 +550,6 @@ static struct cdevsw fore_cdev = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 

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;

sys/dev/iicbus/iic.c

@@ -103,7 +103,6 @@ static struct cdevsw iic_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 /*

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;

sys/dev/kbd/kbd.c

@@ -435,7 +435,6 @@ static struct cdevsw kbd_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 int

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)

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;

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;

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 *));

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 */

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;

sys/dev/pci/pci_user.c

@@ -82,7 +82,6 @@ struct cdevsw pcicdev = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
   
 static int

sys/dev/ppbus/lpt.c

@@ -202,7 +202,6 @@ static struct cdevsw lpt_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 static int

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

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

sys/dev/ppbus/pps.c

@@ -72,7 +72,6 @@ static struct cdevsw pps_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 static void

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 *);

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,
 };
 

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;

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
 };
 
 

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,
 };
 

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,
 };
 

sys/dev/smbus/smb.c

@@ -104,7 +104,6 @@ static struct cdevsw smb_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 /*

sys/dev/snp/snp.c

@@ -52,7 +52,6 @@ static struct cdevsw snp_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 

sys/dev/sound/midi/midi.c

@@ -83,7 +83,6 @@ static struct cdevsw midi_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 /*

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;

sys/dev/sound/pcm/sound.c

@@ -58,7 +58,6 @@ static struct cdevsw snd_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_TRACKCLOSE,
-	/* bmaj */	-1
 };
 
 /*

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");

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 {

sys/dev/syscons/syscons.c

@@ -212,7 +212,6 @@ static struct cdevsw sc_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	D_TTY,
-	/* bmaj */	-1
 };
 
 int

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 */

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

sys/dev/usb/ugen.c

@@ -147,7 +147,6 @@ Static struct cdevsw ugen_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 #endif
 

sys/dev/usb/uhid.c

@@ -152,7 +152,6 @@ Static struct cdevsw uhid_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 #endif
 

sys/dev/usb/ulpt.c

@@ -138,7 +138,6 @@ Static struct cdevsw ulpt_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 #endif
 

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

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);

sys/dev/usb/usb.c

@@ -147,7 +147,6 @@ struct cdevsw usb_cdevsw = {
 	/* dump */      nodump,
 	/* psize */     nopsize,
 	/* flags */     0,
-	/* bmaj */      -1
 };
 #endif
 

sys/dev/usb/uscanner.c

@@ -220,7 +220,6 @@ Static struct cdevsw uscanner_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 #endif
 

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. */

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)
 

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;

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 */

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;

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;

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");

sys/i386/i386/perfmon.c

@@ -73,7 +73,6 @@ static struct cdevsw perfmon_cdevsw = {
 	/* dump */      nodump,
 	/* psize */     nopsize,
 	/* flags */     0,
-	/* bmaj */      -1
 };
 
 /*

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

sys/i386/isa/ctx.c

@@ -164,7 +164,6 @@ static struct cdevsw ctx_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 

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

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,
 };
 

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

sys/i386/isa/gsc.c

@@ -208,7 +208,6 @@ static struct cdevsw gsc_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 

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,
 };
 

sys/i386/isa/loran.c

@@ -642,7 +642,6 @@ static struct cdevsw loran_cdevsw = {
 	/* dump */	nodump,
 	/* psize */	nopsize,
 	/* flags */	0,
-	/* bmaj */	-1
 };
 
 #endif /* _KERNEL */

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
 };
 
 /*---------------------------------------------------------------------------

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)

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 *));

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));

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,
 };
 

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,
 };
 

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,
 };
 

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
 };