mechanical translation of dev_lkm_dummy() to dev_notdef()

13 files changed, 372 insertions, 372 deletions

diff --git a/sys/arch/alpha/alpha/conf.c b/sys/arch/alpha/alpha/conf.c
index 0fe7a84fa7a..fe3a5a9f6f0 100644
--- a/sys/arch/alpha/alpha/conf.c
+++ b/sys/arch/alpha/alpha/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.76 2014/10/09 03:59:58 tedu Exp $	*/
+/*	$OpenBSD: conf.c,v 1.77 2014/10/09 04:10:03 tedu Exp $	*/
 /*	$NetBSD: conf.c,v 1.16 1996/10/18 21:26:57 cgd Exp $	*/
 
 /*-
@@ -65,12 +65,12 @@ struct bdevsw	bdevsw[] =
 	bdev_notdef(),			/* 7: was: concatenated disk driver */
 	bdev_disk_init(NSD,sd),		/* 8: SCSI disk */
 	bdev_disk_init(NVND,vnd),	/* 9: vnode disk driver */
-	bdev_lkm_dummy(),		/* 10 */
-	bdev_lkm_dummy(),		/* 11 */
-	bdev_lkm_dummy(),		/* 12 */
-	bdev_lkm_dummy(),		/* 13 */
-	bdev_lkm_dummy(),		/* 14 */
-	bdev_lkm_dummy(),		/* 15 */
+	bdev_notdef(),			/* 10 */
+	bdev_notdef(),			/* 11 */
+	bdev_notdef(),			/* 12 */
+	bdev_notdef(),			/* 13 */
+	bdev_notdef(),			/* 14 */
+	bdev_notdef(),			/* 15 */
 	bdev_notdef(),			/* 16 was: RAIDframe disk driver */
 };
 int	nblkdev = nitems(bdevsw);
@@ -146,12 +146,12 @@ struct cdevsw	cdevsw[] =
 	cdev_ch_init(NCH,ch),		/* 14: SCSI autochanger */
 	cdev_tty_init(NSCC,scc),	/* 15: scc 8530 serial interface */
 	cdev_notdef(),			/* 16 was lkm */
-	cdev_lkm_dummy(),		/* 17 */
-	cdev_lkm_dummy(),		/* 18 */
-	cdev_lkm_dummy(),		/* 19 */
-	cdev_lkm_dummy(),		/* 20 */
-	cdev_lkm_dummy(),		/* 21 */
-	cdev_lkm_dummy(),		/* 22 */
+	cdev_notdef(),			/* 17 */
+	cdev_notdef(),			/* 18 */
+	cdev_notdef(),			/* 19 */
+	cdev_notdef(),			/* 20 */
+	cdev_notdef(),			/* 21 */
+	cdev_notdef(),			/* 22 */
 	cdev_tty_init(1,prom),          /* 23: XXX prom console */
 	cdev_audio_init(NAUDIO,audio),	/* 24: generic audio I/O */
 	cdev_wsdisplay_init(NWSDISPLAY,wsdisplay), /* 25: workstation console */
diff --git a/sys/arch/amd64/amd64/conf.c b/sys/arch/amd64/amd64/conf.c
index 79cf2bb80f9..4544f4d2e6e 100644
--- a/sys/arch/amd64/amd64/conf.c
+++ b/sys/arch/amd64/amd64/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.47 2014/10/09 03:59:58 tedu Exp $	*/
+/*	$OpenBSD: conf.c,v 1.48 2014/10/09 04:10:03 tedu Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Charles M. Hannum.  All rights reserved.
@@ -62,17 +62,17 @@ struct bdevsw	bdevsw[] =
 	bdev_tape_init(NST,st),		/* 5: SCSI tape */
 	bdev_disk_init(NCD,cd),		/* 6: SCSI CD-ROM */
 	bdev_notdef(),			/* 7 */
-	bdev_lkm_dummy(),		/* 8 */
-	bdev_lkm_dummy(),		/* 9 */
-	bdev_lkm_dummy(),		/* 10 */
-	bdev_lkm_dummy(),		/* 11 */
-	bdev_lkm_dummy(),		/* 12 */
-	bdev_lkm_dummy(),		/* 13 */
+	bdev_notdef(),			/* 8 */
+	bdev_notdef(),			/* 9 */
+	bdev_notdef(),			/* 10 */
+	bdev_notdef(),			/* 11 */
+	bdev_notdef(),			/* 12 */
+	bdev_notdef(),			/* 13 */
 	bdev_disk_init(NVND,vnd),	/* 14: vnode disk driver */
 	bdev_notdef(),			/* 15: was: Sony CD-ROM */
 	bdev_notdef(),			/* 16: was: concatenated disk driver */
 	bdev_disk_init(NRD,rd),		/* 17: ram disk driver */
-	bdev_lkm_dummy(),		/* 18 */
+	bdev_notdef(),			/* 18 */
 	bdev_notdef(),			/* 19 was: RAIDframe disk driver */
 };
 int	nblkdev = nitems(bdevsw);
@@ -187,7 +187,7 @@ struct cdevsw	cdevsw[] =
 	cdev_tty_init(NCOM,com),	/* 8: serial port */
 	cdev_disk_init(NFD,fd),		/* 9: floppy disk */
 	cdev_notdef(),			/* 10 */
-	cdev_lkm_dummy(),		/* 11: Sony CD-ROM */
+	cdev_notdef(),			/* 11: Sony CD-ROM */
 	cdev_wsdisplay_init(NWSDISPLAY,	/* 12: frame buffers, etc. */
 	    wsdisplay),
 	cdev_disk_init(NSD,sd),		/* 13: SCSI disk */
@@ -210,12 +210,12 @@ struct cdevsw	cdevsw[] =
 	cdev_notdef(),			/* 26 */
 	cdev_spkr_init(NSPKR,spkr),	/* 27: PC speaker */
 	cdev_notdef(),			/* 28 was LKM */
-	cdev_lkm_dummy(),		/* 29 */
-	cdev_lkm_dummy(),		/* 30 */
-	cdev_lkm_dummy(),		/* 31 */
-	cdev_lkm_dummy(),		/* 32 */
-	cdev_lkm_dummy(),		/* 33 */
-	cdev_lkm_dummy(),		/* 34 */
+	cdev_notdef(),			/* 29 */
+	cdev_notdef(),			/* 30 */
+	cdev_notdef(),			/* 31 */
+	cdev_notdef(),			/* 32 */
+	cdev_notdef(),			/* 33 */
+	cdev_notdef(),			/* 34 */
 	cdev_notdef(),			/* 35: Microsoft mouse */
 	cdev_notdef(),			/* 36: Logitech mouse */
 	cdev_notdef(),			/* 37: Extended PS/2 mouse */
diff --git a/sys/arch/arm/arm/conf.c b/sys/arch/arm/arm/conf.c
index 2ca1dd5f781..ae6e6a25192 100644
--- a/sys/arch/arm/arm/conf.c
+++ b/sys/arch/arm/arm/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.39 2014/10/09 03:59:58 tedu Exp $	*/
+/*	$OpenBSD: conf.c,v 1.40 2014/10/09 04:10:03 tedu Exp $	*/
 /*	$NetBSD: conf.c,v 1.10 2002/04/19 01:04:38 wiz Exp $	*/
 
 /*
@@ -149,103 +149,103 @@ cdev_decl(radio);
 /* Block devices */
 
 struct bdevsw bdevsw[] = {
-	bdev_lkm_dummy(),		/*  0: */
+	bdev_notdef(),			/*  0: */
 	bdev_swap_init(1, sw),		/*  1: swap pseudo-device */
-	bdev_lkm_dummy(),		/*  2: */
-	bdev_lkm_dummy(),		/*  3: */
-	bdev_lkm_dummy(),		/*  4: */
-	bdev_lkm_dummy(),		/*  5: */
-	bdev_lkm_dummy(),		/*  6: */
-	bdev_lkm_dummy(),		/*  7: */
-	bdev_lkm_dummy(),		/*  8: */
-	bdev_lkm_dummy(),		/*  9: */
-	bdev_lkm_dummy(),		/* 10: */
-	bdev_lkm_dummy(),		/* 11: */
-	bdev_lkm_dummy(),		/* 12: */
-	bdev_lkm_dummy(),		/* 13: */
-	bdev_lkm_dummy(),		/* 14: */
-	bdev_lkm_dummy(),		/* 15: */
+	bdev_notdef(),			/*  2: */
+	bdev_notdef(),			/*  3: */
+	bdev_notdef(),			/*  4: */
+	bdev_notdef(),			/*  5: */
+	bdev_notdef(),			/*  6: */
+	bdev_notdef(),			/*  7: */
+	bdev_notdef(),			/*  8: */
+	bdev_notdef(),			/*  9: */
+	bdev_notdef(),			/* 10: */
+	bdev_notdef(),			/* 11: */
+	bdev_notdef(),			/* 12: */
+	bdev_notdef(),			/* 13: */
+	bdev_notdef(),			/* 14: */
+	bdev_notdef(),			/* 15: */
 	bdev_disk_init(NWD,wd),		/* 16: Internal IDE disk */
-	bdev_lkm_dummy(),		/* 17: */
+	bdev_notdef(),			/* 17: */
 	bdev_disk_init(NRD,rd),		/* 18: memory disk */
 	bdev_disk_init(NVND,vnd),	/* 19: vnode disk driver */
-	bdev_lkm_dummy(),		/* 20: */
+	bdev_notdef(),			/* 20: */
  	bdev_notdef(),			/* 21: was: concatenated disk driver */
-	bdev_lkm_dummy(),		/* 22: */
-	bdev_lkm_dummy(),		/* 23: */
+	bdev_notdef(),			/* 22: */
+	bdev_notdef(),			/* 23: */
 	bdev_disk_init(NSD,sd),		/* 24: SCSI disk */
 	bdev_tape_init(NST,st),		/* 25: SCSI tape */
 	bdev_disk_init(NCD,cd),		/* 26: SCSI cdrom */
-	bdev_lkm_dummy(),		/* 27: */
-	bdev_lkm_dummy(),		/* 28: */
-	bdev_lkm_dummy(),		/* 29: */
-	bdev_lkm_dummy(),		/* 30: */
-	bdev_lkm_dummy(),		/* 31: */
-	bdev_lkm_dummy(),		/* 32: */
-	bdev_lkm_dummy(),		/* 33: */
-	bdev_lkm_dummy(),		/* 34: */
-	bdev_lkm_dummy(),		/* 35: */
-	bdev_lkm_dummy(),		/* 36: */
-	bdev_lkm_dummy(),		/* 37: */
-	bdev_lkm_dummy(),		/* 38: */
-	bdev_lkm_dummy(),		/* 39: */
-	bdev_lkm_dummy(),		/* 40: */
-	bdev_lkm_dummy(),		/* 41: */
-	bdev_lkm_dummy(),		/* 42: */
-	bdev_lkm_dummy(),		/* 43: */
-	bdev_lkm_dummy(),		/* 44: */
-	bdev_lkm_dummy(),		/* 45: */
-	bdev_lkm_dummy(),		/* 46: */
-	bdev_lkm_dummy(),		/* 47: */
-	bdev_lkm_dummy(),		/* 48: */
-	bdev_lkm_dummy(),		/* 49: */
-	bdev_lkm_dummy(),		/* 50: */
-	bdev_lkm_dummy(),		/* 51: */
-	bdev_lkm_dummy(),		/* 52: */
-	bdev_lkm_dummy(),		/* 53: */
-	bdev_lkm_dummy(),		/* 54: */
-	bdev_lkm_dummy(),		/* 55: */
-	bdev_lkm_dummy(),		/* 56: */
-	bdev_lkm_dummy(),		/* 57: */
-	bdev_lkm_dummy(),		/* 58: */
-	bdev_lkm_dummy(),		/* 59: */
-	bdev_lkm_dummy(),		/* 60: */
-	bdev_lkm_dummy(),		/* 61: */
-	bdev_lkm_dummy(),		/* 62: */
-	bdev_lkm_dummy(),		/* 63: */
-	bdev_lkm_dummy(),		/* 64: */
-	bdev_lkm_dummy(),		/* 65: */
-	bdev_lkm_dummy(),		/* 66: */
-	bdev_lkm_dummy(),		/* 67: */
-	bdev_lkm_dummy(),		/* 68: */
-	bdev_lkm_dummy(),		/* 69: */
-	bdev_lkm_dummy(),		/* 70: */
+	bdev_notdef(),			/* 27: */
+	bdev_notdef(),			/* 28: */
+	bdev_notdef(),			/* 29: */
+	bdev_notdef(),			/* 30: */
+	bdev_notdef(),			/* 31: */
+	bdev_notdef(),			/* 32: */
+	bdev_notdef(),			/* 33: */
+	bdev_notdef(),			/* 34: */
+	bdev_notdef(),			/* 35: */
+	bdev_notdef(),			/* 36: */
+	bdev_notdef(),			/* 37: */
+	bdev_notdef(),			/* 38: */
+	bdev_notdef(),			/* 39: */
+	bdev_notdef(),			/* 40: */
+	bdev_notdef(),			/* 41: */
+	bdev_notdef(),			/* 42: */
+	bdev_notdef(),			/* 43: */
+	bdev_notdef(),			/* 44: */
+	bdev_notdef(),			/* 45: */
+	bdev_notdef(),			/* 46: */
+	bdev_notdef(),			/* 47: */
+	bdev_notdef(),			/* 48: */
+	bdev_notdef(),			/* 49: */
+	bdev_notdef(),			/* 50: */
+	bdev_notdef(),			/* 51: */
+	bdev_notdef(),			/* 52: */
+	bdev_notdef(),			/* 53: */
+	bdev_notdef(),			/* 54: */
+	bdev_notdef(),			/* 55: */
+	bdev_notdef(),			/* 56: */
+	bdev_notdef(),			/* 57: */
+	bdev_notdef(),			/* 58: */
+	bdev_notdef(),			/* 59: */
+	bdev_notdef(),			/* 60: */
+	bdev_notdef(),			/* 61: */
+	bdev_notdef(),			/* 62: */
+	bdev_notdef(),			/* 63: */
+	bdev_notdef(),			/* 64: */
+	bdev_notdef(),			/* 65: */
+	bdev_notdef(),			/* 66: */
+	bdev_notdef(),			/* 67: */
+	bdev_notdef(),			/* 68: */
+	bdev_notdef(),			/* 69: */
+	bdev_notdef(),			/* 70: */
 	bdev_notdef(),			/* 71 was: RAIDframe disk driver */
-	bdev_lkm_dummy(),		/* 72: */
-	bdev_lkm_dummy(),		/* 73: */
-	bdev_lkm_dummy(),		/* 74: */
-	bdev_lkm_dummy(),		/* 75: */
-	bdev_lkm_dummy(),		/* 76: */
-	bdev_lkm_dummy(),		/* 77: */
-	bdev_lkm_dummy(),		/* 78: */
-	bdev_lkm_dummy(),		/* 79: */
-	bdev_lkm_dummy(),		/* 80: */
-	bdev_lkm_dummy(),		/* 81: */
-	bdev_lkm_dummy(),		/* 82: */
-	bdev_lkm_dummy(),		/* 83: */
-	bdev_lkm_dummy(),		/* 84: */
-	bdev_lkm_dummy(),		/* 85: */
-	bdev_lkm_dummy(),		/* 86: */
-	bdev_lkm_dummy(),		/* 87: */
-	bdev_lkm_dummy(),		/* 88: */
-	bdev_lkm_dummy(),		/* 89: */
-	bdev_lkm_dummy(),		/* 90: */
-	bdev_lkm_dummy(),		/* 91: */
-	bdev_lkm_dummy(),		/* 93: */
-	bdev_lkm_dummy(),		/* 94: */
-	bdev_lkm_dummy(),		/* 95: */
-	bdev_lkm_dummy(),		/* 96: */
-	bdev_lkm_dummy(),		/* 97: */
+	bdev_notdef(),			/* 72: */
+	bdev_notdef(),			/* 73: */
+	bdev_notdef(),			/* 74: */
+	bdev_notdef(),			/* 75: */
+	bdev_notdef(),			/* 76: */
+	bdev_notdef(),			/* 77: */
+	bdev_notdef(),			/* 78: */
+	bdev_notdef(),			/* 79: */
+	bdev_notdef(),			/* 80: */
+	bdev_notdef(),			/* 81: */
+	bdev_notdef(),			/* 82: */
+	bdev_notdef(),			/* 83: */
+	bdev_notdef(),			/* 84: */
+	bdev_notdef(),			/* 85: */
+	bdev_notdef(),			/* 86: */
+	bdev_notdef(),			/* 87: */
+	bdev_notdef(),			/* 88: */
+	bdev_notdef(),			/* 89: */
+	bdev_notdef(),			/* 90: */
+	bdev_notdef(),			/* 91: */
+	bdev_notdef(),			/* 93: */
+	bdev_notdef(),			/* 94: */
+	bdev_notdef(),			/* 95: */
+	bdev_notdef(),			/* 96: */
+	bdev_notdef(),			/* 97: */
 };
 
 /* Character devices */
@@ -284,52 +284,52 @@ struct cdevsw cdevsw[] = {
 	cdev_fd_init(1,filedesc),		/*  7: file descriptor pseudo-device */
 	cdev_ksyms_init(NKSYMS,ksyms),		/*  8: Kernel symbols device */
 	cdev_lpt_init(NLPT,lpt),		/*  9: parallel printer */
-	cdev_lkm_dummy(),			/* 10: */
-	cdev_lkm_dummy(),			/* 11: */
+	cdev_notdef(),				/* 10: */
+	cdev_notdef(),				/* 11: */
 	cdev_tty_init(NCOM,com),		/* 12: serial port */
 	cdev_gpio_init(NGPIO,gpio),     	/* 13: GPIO interface */
 	cdev_notdef(),				/* 14 was alternate serial port */
-	cdev_lkm_dummy(),			/* 15: */
+	cdev_notdef(),				/* 15: */
 	cdev_disk_init(NWD,wd),			/* 16: ST506/ESDI/IDE disk */
-	cdev_lkm_dummy(),			/* 17: */
+	cdev_notdef(),				/* 17: */
 	cdev_disk_init(NRD,rd),			/* 18: ram disk driver */
 	cdev_disk_init(NVND,vnd),		/* 19: vnode disk driver */
-	cdev_lkm_dummy(),			/* 20: */
+	cdev_notdef(),				/* 20: */
 	cdev_notdef(),				/* 21: was: concatenated disk driver */
 	cdev_bpf_init(NBPFILTER,bpf),		/* 22: Berkeley packet filter */
-	cdev_lkm_dummy(),			/* 23: */
+	cdev_notdef(),				/* 23: */
 	cdev_disk_init(NSD,sd),			/* 24: SCSI disk */
 	cdev_tape_init(NST,st),			/* 25: SCSI tape */
 	cdev_disk_init(NCD,cd),			/* 26: SCSI CD-ROM */
 	cdev_ch_init(NCH,ch),	 		/* 27: SCSI autochanger */
 	cdev_uk_init(NUK,uk),	 		/* 28: SCSI unknown */
 	cdev_notdef(),				/* 29: */
-	cdev_lkm_dummy(),			/* 30: */
-	cdev_lkm_dummy(),			/* 31: */
-	cdev_lkm_dummy(),			/* 32: */
+	cdev_notdef(),				/* 30: */
+	cdev_notdef(),				/* 31: */
+	cdev_notdef(),				/* 32: */
 	cdev_tun_init(NTUN,tun),		/* 33: network tunnel */
 	cdev_apm_init(NAPM,apm),		/* 34: APM interface */
 	cdev_notdef(),				/* 35: was LKM */
 	cdev_audio_init(NAUDIO,audio),		/* 36: generic audio I/O */
 	cdev_hotplug_init(NHOTPLUG,hotplug),	/* 37: devices hot plugging*/
 	cdev_video_init(NVIDEO,video),		/* 38: generic video I/O */
-	cdev_lkm_dummy(),			/* 39: reserved */
+	cdev_notdef(),				/* 39: reserved */
 	cdev_random_init(1,random),		/* 40: random generator */
-	cdev_lkm_dummy(),			/* 41: reserved */
-	cdev_lkm_dummy(),			/* 42: reserved */
-	cdev_lkm_dummy(),			/* 43: reserved */
-	cdev_lkm_dummy(),			/* 44: reserved */
-	cdev_lkm_dummy(),			/* 45: reserved */
+	cdev_notdef(),				/* 41: reserved */
+	cdev_notdef(),				/* 42: reserved */
+	cdev_notdef(),				/* 43: reserved */
+	cdev_notdef(),				/* 44: reserved */
+	cdev_notdef(),				/* 45: reserved */
 	cdev_pf_init(NPF,pf),           	/* 46: packet filter */
 	cdev_notdef(),				/* 47: was: /dev/crypto */
-	cdev_lkm_dummy(),			/* 48: reserved */
-	cdev_lkm_dummy(),			/* 49: reserved */
+	cdev_notdef(),				/* 48: reserved */
+	cdev_notdef(),				/* 49: reserved */
 	cdev_systrace_init(NSYSTRACE,systrace),	/* 50: system call tracing */
 	cdev_notdef(),				/* 51: reserved */
  	cdev_bio_init(NBIO,bio),		/* 52: ioctl tunnel */
 	cdev_notdef(),				/* 53: reserved */
 	cdev_notdef(),				/* 54 was FOOTBRIDGE console */
-	cdev_lkm_dummy(),			/* 55: Reserved for bypass device */	
+	cdev_notdef(),				/* 55: Reserved for bypass device */	
 	cdev_notdef(),				/* 56: reserved */
 	cdev_midi_init(NMIDI,midi),		/* 57: MIDI I/O */
 	cdev_notdef(),				/* 58 was: sequencer I/O */
@@ -346,11 +346,11 @@ struct cdevsw cdevsw[] = {
 	cdev_notdef(),				/* 69: was USB scanners */
 	cdev_usbdev_init(NUGEN,ugen),		/* 70: USB generic driver */
 	cdev_notdef(),    			/* 71 was: RAIDframe disk driver */
-	cdev_lkm_dummy(),			/* 72: reserved */
-	cdev_lkm_dummy(),			/* 73: reserved */
-	cdev_lkm_dummy(),			/* 74: reserved */
-	cdev_lkm_dummy(),			/* 75: reserved */
-	cdev_lkm_dummy(),			/* 76: reserved */
+	cdev_notdef(),				/* 72: reserved */
+	cdev_notdef(),				/* 73: reserved */
+	cdev_notdef(),				/* 74: reserved */
+	cdev_notdef(),				/* 75: reserved */
+	cdev_notdef(),				/* 76: reserved */
 	cdev_fuse_init(NFUSE,fuse),		/* 77: fuse */
 	cdev_notdef(),                          /* 78: removed device */
 	cdev_notdef(),                          /* 79: removed device */
diff --git a/sys/arch/aviion/aviion/conf.c b/sys/arch/aviion/aviion/conf.c
index f748acec2b6..afc1a04e3d7 100644
--- a/sys/arch/aviion/aviion/conf.c
+++ b/sys/arch/aviion/aviion/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.18 2014/10/09 03:59:58 tedu Exp $	*/
+/*	$OpenBSD: conf.c,v 1.19 2014/10/09 04:10:03 tedu Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -76,12 +76,12 @@ struct bdevsw	bdevsw[] =
 	bdev_notdef(),			/* 10 */
 	bdev_notdef(),			/* 11 */
 	bdev_notdef(),			/* 12 */
-	bdev_lkm_dummy(),		/* 13 */
-	bdev_lkm_dummy(),		/* 14 */
-	bdev_lkm_dummy(),		/* 15 */
-	bdev_lkm_dummy(),		/* 16 */
-	bdev_lkm_dummy(),		/* 17 */
-	bdev_lkm_dummy(),		/* 18 */
+	bdev_notdef(),			/* 13 */
+	bdev_notdef(),			/* 14 */
+	bdev_notdef(),			/* 15 */
+	bdev_notdef(),			/* 16 */
+	bdev_notdef(),			/* 17 */
+	bdev_notdef(),			/* 18 */
 };
 int	nblkdev = nitems(bdevsw);
 
@@ -120,12 +120,12 @@ struct cdevsw	cdevsw[] =
 	cdev_mm_init(NVME,vme),		/* 30: /dev/vme* */
 	cdev_notdef(),			/* 31: old /dev/vmelX */
 	cdev_notdef(),			/* 32: old /dev/vmesX */
-	cdev_lkm_dummy(),		/* 33 */
-	cdev_lkm_dummy(),		/* 34 */
-	cdev_lkm_dummy(),		/* 35 */
-	cdev_lkm_dummy(),		/* 36 */
-	cdev_lkm_dummy(),		/* 37 */
-	cdev_lkm_dummy(),		/* 38 */
+	cdev_notdef(),			/* 33 */
+	cdev_notdef(),			/* 34 */
+	cdev_notdef(),			/* 35 */
+	cdev_notdef(),			/* 36 */
+	cdev_notdef(),			/* 37 */
+	cdev_notdef(),			/* 38 */
 	cdev_pf_init(NPF,pf),		/* 39: packet filter */
 	cdev_random_init(1,random),	/* 40: random data source */
 	cdev_uk_init(NUK,uk),		/* 41 */
diff --git a/sys/arch/hppa/hppa/conf.c b/sys/arch/hppa/hppa/conf.c
index da46c5b2345..646702d09e0 100644
--- a/sys/arch/hppa/hppa/conf.c
+++ b/sys/arch/hppa/hppa/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.60 2014/10/09 03:59:58 tedu Exp $	*/
+/*	$OpenBSD: conf.c,v 1.61 2014/10/09 04:10:03 tedu Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -69,12 +69,12 @@ struct bdevsw   bdevsw[] =
 	bdev_disk_init(NCD,cd),		/*  6: SCSI CD-ROM */
 	bdev_disk_init(NFD,fd),		/*  7: floppy drive */
 	bdev_disk_init(NWD,wd),		/*  8: ST506 drive */
-	bdev_lkm_dummy(),		/*  9: */
-	bdev_lkm_dummy(),		/* 10: */
-	bdev_lkm_dummy(),		/* 11: */
-	bdev_lkm_dummy(),		/* 12: */
-	bdev_lkm_dummy(),		/* 13: */
-	bdev_lkm_dummy(),		/* 14: */
+	bdev_notdef(),			/*  9: */
+	bdev_notdef(),			/* 10: */
+	bdev_notdef(),			/* 11: */
+	bdev_notdef(),			/* 12: */
+	bdev_notdef(),			/* 13: */
+	bdev_notdef(),			/* 14: */
 };
 int	nblkdev = nitems(bdevsw);
 
@@ -174,12 +174,12 @@ struct cdevsw   cdevsw[] =
 	cdev_tty_init(NUCOM,ucom),	/* 45: USB tty */
 	cdev_notdef(),			/* 46: was USB scanners */
 	cdev_hotplug_init(NHOTPLUG,hotplug), /* 47: devices hot plugging */
-	cdev_lkm_dummy(),		/* 48: */
-	cdev_lkm_dummy(),		/* 49: */
-	cdev_lkm_dummy(),		/* 50: */
-	cdev_lkm_dummy(),		/* 51: */
-	cdev_lkm_dummy(),		/* 52: */
-	cdev_lkm_dummy(),		/* 53: */
+	cdev_notdef(),			/* 48: */
+	cdev_notdef(),			/* 49: */
+	cdev_notdef(),			/* 50: */
+	cdev_notdef(),			/* 51: */
+	cdev_notdef(),			/* 52: */
+	cdev_notdef(),			/* 53: */
 	cdev_vscsi_init(NVSCSI,vscsi),	/* 54: vscsi */
 	cdev_notdef(),
 	cdev_disk_init(1,diskmap),	/* 56: disk mapper */
diff --git a/sys/arch/hppa64/hppa64/conf.c b/sys/arch/hppa64/hppa64/conf.c
index d7cefd9bdb6..620ec1b21d4 100644
--- a/sys/arch/hppa64/hppa64/conf.c
+++ b/sys/arch/hppa64/hppa64/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.27 2014/10/09 03:59:59 tedu Exp $	*/
+/*	$OpenBSD: conf.c,v 1.28 2014/10/09 04:10:03 tedu Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -69,12 +69,12 @@ struct bdevsw   bdevsw[] =
 	bdev_disk_init(NCD,cd),		/*  6: SCSI CD-ROM */
 	bdev_disk_init(NFD,fd),		/*  7: floppy drive */
 	bdev_disk_init(NWD,wd),		/*  8: ST506 drive */
-	bdev_lkm_dummy(),		/*  9: */
-	bdev_lkm_dummy(),		/* 10: */
-	bdev_lkm_dummy(),		/* 11: */
-	bdev_lkm_dummy(),		/* 12: */
-	bdev_lkm_dummy(),		/* 13: */
-	bdev_lkm_dummy(),		/* 14: */
+	bdev_notdef(),			/*  9: */
+	bdev_notdef(),			/* 10: */
+	bdev_notdef(),			/* 11: */
+	bdev_notdef(),			/* 12: */
+	bdev_notdef(),			/* 13: */
+	bdev_notdef(),			/* 14: */
 };
 int	nblkdev = nitems(bdevsw);
 
@@ -174,12 +174,12 @@ struct cdevsw   cdevsw[] =
 	cdev_tty_init(NUCOM,ucom),	/* 45: USB tty */
 	cdev_notdef(),			/* 46: was USB scanners */
 	cdev_hotplug_init(NHOTPLUG,hotplug), /* 47: devices hot plugging */
-	cdev_lkm_dummy(),		/* 48: */
-	cdev_lkm_dummy(),		/* 49: */
-	cdev_lkm_dummy(),		/* 50: */
-	cdev_lkm_dummy(),		/* 51: */
-	cdev_lkm_dummy(),		/* 52: */
-	cdev_lkm_dummy(),		/* 53: */
+	cdev_notdef(),			/* 48: */
+	cdev_notdef(),			/* 49: */
+	cdev_notdef(),			/* 50: */
+	cdev_notdef(),			/* 51: */
+	cdev_notdef(),			/* 52: */
+	cdev_notdef(),			/* 53: */
 	cdev_vscsi_init(NVSCSI,vscsi),	/* 54: vscsi */
 	cdev_notdef(),
 	cdev_disk_init(1,diskmap),	/* 56: disk mapper */
diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c
index 861d24f582c..ad472d7d879 100644
--- a/sys/arch/i386/i386/conf.c
+++ b/sys/arch/i386/i386/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.148 2014/10/09 03:59:59 tedu Exp $	*/
+/*	$OpenBSD: conf.c,v 1.149 2014/10/09 04:10:03 tedu Exp $	*/
 /*	$NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $	*/
 
 /*
@@ -63,12 +63,12 @@ struct bdevsw	bdevsw[] =
 	bdev_tape_init(NST,st),		/* 5: SCSI tape */
 	bdev_disk_init(NCD,cd),		/* 6: SCSI CD-ROM */
 	bdev_notdef(),			/* 7 */
-	bdev_lkm_dummy(),		/* 8 */
-	bdev_lkm_dummy(),		/* 9 */
-	bdev_lkm_dummy(),		/* 10 */
-	bdev_lkm_dummy(),		/* 11 */
-	bdev_lkm_dummy(),		/* 12 */
-	bdev_lkm_dummy(),		/* 13 */
+	bdev_notdef(),			/* 8 */
+	bdev_notdef(),			/* 9 */
+	bdev_notdef(),			/* 10 */
+	bdev_notdef(),			/* 11 */
+	bdev_notdef(),			/* 12 */
+	bdev_notdef(),			/* 13 */
 	bdev_disk_init(NVND,vnd),	/* 14: vnode disk driver */
 	bdev_notdef(),			/* 15 */
 	bdev_notdef(),			/* 16: was: concatenated disk driver */
@@ -214,12 +214,12 @@ struct cdevsw	cdevsw[] =
 	cdev_joy_init(NJOY,joy),        /* 26: joystick */
 	cdev_spkr_init(NSPKR,spkr),	/* 27: PC speaker */
 	cdev_notdef(),			/* 28: was LKM */
-	cdev_lkm_dummy(),		/* 29 */
-	cdev_lkm_dummy(),		/* 30 */
-	cdev_lkm_dummy(),		/* 31 */
-	cdev_lkm_dummy(),		/* 32 */
-	cdev_lkm_dummy(),		/* 33 */
-	cdev_lkm_dummy(),		/* 34 */
+	cdev_notdef(),			/* 29 */
+	cdev_notdef(),			/* 30 */
+	cdev_notdef(),			/* 31 */
+	cdev_notdef(),			/* 32 */
+	cdev_notdef(),			/* 33 */
+	cdev_notdef(),			/* 34 */
 	cdev_notdef(),			/* 35: Microsoft mouse */
 	cdev_notdef(),			/* 36: Logitech mouse */
 	cdev_notdef(),			/* 37: Extended PS/2 mouse */
diff --git a/sys/arch/landisk/landisk/conf.c b/sys/arch/landisk/landisk/conf.c
index ff6fb174f39..9520acec3ed 100644
--- a/sys/arch/landisk/landisk/conf.c
+++ b/sys/arch/landisk/landisk/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.29 2014/10/09 03:59:59 tedu Exp $	*/
+/*	$OpenBSD: conf.c,v 1.30 2014/10/09 04:10:03 tedu Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -136,103 +136,103 @@ cdev_decl(radio);
 /* Block devices */
 
 struct bdevsw bdevsw[] = {
-	bdev_lkm_dummy(),		/*  0: */
+	bdev_notdef(),			/*  0: */
 	bdev_swap_init(1, sw),		/*  1: swap pseudo-device */
-	bdev_lkm_dummy(),		/*  2: */
-	bdev_lkm_dummy(),		/*  3: */
-	bdev_lkm_dummy(),		/*  4: */
-	bdev_lkm_dummy(),		/*  5: */
-	bdev_lkm_dummy(),		/*  6: */
-	bdev_lkm_dummy(),		/*  7: */
-	bdev_lkm_dummy(),		/*  8: */
-	bdev_lkm_dummy(),		/*  9: */
-	bdev_lkm_dummy(),		/* 10: */
-	bdev_lkm_dummy(),		/* 11: */
-	bdev_lkm_dummy(),		/* 12: */
-	bdev_lkm_dummy(),		/* 13: */
-	bdev_lkm_dummy(),		/* 14: */
-	bdev_lkm_dummy(),		/* 15: */
+	bdev_notdef(),			/*  2: */
+	bdev_notdef(),			/*  3: */
+	bdev_notdef(),			/*  4: */
+	bdev_notdef(),			/*  5: */
+	bdev_notdef(),			/*  6: */
+	bdev_notdef(),			/*  7: */
+	bdev_notdef(),			/*  8: */
+	bdev_notdef(),			/*  9: */
+	bdev_notdef(),			/* 10: */
+	bdev_notdef(),			/* 11: */
+	bdev_notdef(),			/* 12: */
+	bdev_notdef(),			/* 13: */
+	bdev_notdef(),			/* 14: */
+	bdev_notdef(),			/* 15: */
 	bdev_disk_init(NWD,wd),		/* 16: Internal IDE disk */
-	bdev_lkm_dummy(),		/* 17: */
+	bdev_notdef(),			/* 17: */
 	bdev_disk_init(NRD,rd),		/* 18: memory disk */
 	bdev_disk_init(NVND,vnd),	/* 19: vnode disk driver */
-	bdev_lkm_dummy(),		/* 20: */
+	bdev_notdef(),			/* 20: */
  	bdev_notdef(),			/* 21: was: concatenated disk driver */
-	bdev_lkm_dummy(),		/* 22: */
-	bdev_lkm_dummy(),		/* 23: */
+	bdev_notdef(),			/* 22: */
+	bdev_notdef(),			/* 23: */
 	bdev_disk_init(NSD,sd),		/* 24: SCSI disk */
 	bdev_tape_init(NST,st),		/* 25: SCSI tape */
 	bdev_disk_init(NCD,cd),		/* 26: SCSI cdrom */
-	bdev_lkm_dummy(),		/* 27: */
-	bdev_lkm_dummy(),		/* 28: */
-	bdev_lkm_dummy(),		/* 29: */
-	bdev_lkm_dummy(),		/* 30: */
-	bdev_lkm_dummy(),		/* 31: */
-	bdev_lkm_dummy(),		/* 32: */
-	bdev_lkm_dummy(),		/* 33: */
-	bdev_lkm_dummy(),		/* 34: */
-	bdev_lkm_dummy(),		/* 35: */
-	bdev_lkm_dummy(),		/* 36: */
-	bdev_lkm_dummy(),		/* 37: */
-	bdev_lkm_dummy(),		/* 38: */
-	bdev_lkm_dummy(),		/* 39: */
-	bdev_lkm_dummy(),		/* 40: */
-	bdev_lkm_dummy(),		/* 41: */
-	bdev_lkm_dummy(),		/* 42: */
-	bdev_lkm_dummy(),		/* 43: */
-	bdev_lkm_dummy(),		/* 44: */
-	bdev_lkm_dummy(),		/* 45: */
-	bdev_lkm_dummy(),		/* 46: */
-	bdev_lkm_dummy(),		/* 47: */
-	bdev_lkm_dummy(),		/* 48: */
-	bdev_lkm_dummy(),		/* 49: */
-	bdev_lkm_dummy(),		/* 50: */
-	bdev_lkm_dummy(),		/* 51: */
-	bdev_lkm_dummy(),		/* 52: */
-	bdev_lkm_dummy(),		/* 53: */
-	bdev_lkm_dummy(),		/* 54: */
-	bdev_lkm_dummy(),		/* 55: */
-	bdev_lkm_dummy(),		/* 56: */
-	bdev_lkm_dummy(),		/* 57: */
-	bdev_lkm_dummy(),		/* 58: */
-	bdev_lkm_dummy(),		/* 59: */
-	bdev_lkm_dummy(),		/* 60: */
-	bdev_lkm_dummy(),		/* 61: */
-	bdev_lkm_dummy(),		/* 62: */
-	bdev_lkm_dummy(),		/* 63: */
-	bdev_lkm_dummy(),		/* 64: */
-	bdev_lkm_dummy(),		/* 65: */
-	bdev_lkm_dummy(),		/* 66: */
-	bdev_lkm_dummy(),		/* 67: */
-	bdev_lkm_dummy(),		/* 68: */
-	bdev_lkm_dummy(),		/* 69: */
-	bdev_lkm_dummy(),		/* 70: */
+	bdev_notdef(),			/* 27: */
+	bdev_notdef(),			/* 28: */
+	bdev_notdef(),			/* 29: */
+	bdev_notdef(),			/* 30: */
+	bdev_notdef(),			/* 31: */
+	bdev_notdef(),			/* 32: */
+	bdev_notdef(),			/* 33: */
+	bdev_notdef(),			/* 34: */
+	bdev_notdef(),			/* 35: */
+	bdev_notdef(),			/* 36: */
+	bdev_notdef(),			/* 37: */
+	bdev_notdef(),			/* 38: */
+	bdev_notdef(),			/* 39: */
+	bdev_notdef(),			/* 40: */
+	bdev_notdef(),			/* 41: */
+	bdev_notdef(),			/* 42: */
+	bdev_notdef(),			/* 43: */
+	bdev_notdef(),			/* 44: */
+	bdev_notdef(),			/* 45: */
+	bdev_notdef(),			/* 46: */
+	bdev_notdef(),			/* 47: */
+	bdev_notdef(),			/* 48: */
+	bdev_notdef(),			/* 49: */
+	bdev_notdef(),			/* 50: */
+	bdev_notdef(),			/* 51: */
+	bdev_notdef(),			/* 52: */
+	bdev_notdef(),			/* 53: */
+	bdev_notdef(),			/* 54: */
+	bdev_notdef(),			/* 55: */
+	bdev_notdef(),			/* 56: */
+	bdev_notdef(),			/* 57: */
+	bdev_notdef(),			/* 58: */
+	bdev_notdef(),			/* 59: */
+	bdev_notdef(),			/* 60: */
+	bdev_notdef(),			/* 61: */
+	bdev_notdef(),			/* 62: */
+	bdev_notdef(),			/* 63: */
+	bdev_notdef(),			/* 64: */
+	bdev_notdef(),			/* 65: */
+	bdev_notdef(),			/* 66: */
+	bdev_notdef(),			/* 67: */
+	bdev_notdef(),			/* 68: */
+	bdev_notdef(),			/* 69: */
+	bdev_notdef(),			/* 70: */
 	bdev_notdef(),			/* 71 was: RAIDframe disk driver */
-	bdev_lkm_dummy(),		/* 72: */
-	bdev_lkm_dummy(),		/* 73: */
-	bdev_lkm_dummy(),		/* 74: */
-	bdev_lkm_dummy(),		/* 75: */
-	bdev_lkm_dummy(),		/* 76: */
-	bdev_lkm_dummy(),		/* 77: */
-	bdev_lkm_dummy(),		/* 78: */
-	bdev_lkm_dummy(),		/* 79: */
-	bdev_lkm_dummy(),		/* 80: */
-	bdev_lkm_dummy(),		/* 81: */
-	bdev_lkm_dummy(),		/* 82: */
-	bdev_lkm_dummy(),		/* 83: */
-	bdev_lkm_dummy(),		/* 84: */
-	bdev_lkm_dummy(),		/* 85: */
-	bdev_lkm_dummy(),		/* 86: */
-	bdev_lkm_dummy(),		/* 87: */
-	bdev_lkm_dummy(),		/* 88: */
-	bdev_lkm_dummy(),		/* 89: */
-	bdev_lkm_dummy(),		/* 90: */
-	bdev_lkm_dummy(),		/* 91: */
-	bdev_lkm_dummy(),		/* 93: */
-	bdev_lkm_dummy(),		/* 94: */
-	bdev_lkm_dummy(),		/* 95: */
-	bdev_lkm_dummy(),		/* 96: */
-	bdev_lkm_dummy(),		/* 97: */
+	bdev_notdef(),			/* 72: */
+	bdev_notdef(),			/* 73: */
+	bdev_notdef(),			/* 74: */
+	bdev_notdef(),			/* 75: */
+	bdev_notdef(),			/* 76: */
+	bdev_notdef(),			/* 77: */
+	bdev_notdef(),			/* 78: */
+	bdev_notdef(),			/* 79: */
+	bdev_notdef(),			/* 80: */
+	bdev_notdef(),			/* 81: */
+	bdev_notdef(),			/* 82: */
+	bdev_notdef(),			/* 83: */
+	bdev_notdef(),			/* 84: */
+	bdev_notdef(),			/* 85: */
+	bdev_notdef(),			/* 86: */
+	bdev_notdef(),			/* 87: */
+	bdev_notdef(),			/* 88: */
+	bdev_notdef(),			/* 89: */
+	bdev_notdef(),			/* 90: */
+	bdev_notdef(),			/* 91: */
+	bdev_notdef(),			/* 93: */
+	bdev_notdef(),			/* 94: */
+	bdev_notdef(),			/* 95: */
+	bdev_notdef(),			/* 96: */
+	bdev_notdef(),			/* 97: */
 };
 
 /* Character devices */
@@ -259,53 +259,53 @@ struct cdevsw cdevsw[] = {
 	cdev_log_init(1,log),			/*  6: /dev/klog */
 	cdev_fd_init(1,filedesc),		/*  7: file descriptor pseudo-device */
 	cdev_ksyms_init(NKSYMS,ksyms),		/*  8: Kernel symbols device */
-	cdev_lkm_dummy(),			/*  9: */
-	cdev_lkm_dummy(),			/* 10: */
+	cdev_notdef(),				/*  9: */
+	cdev_notdef(),				/* 10: */
 	cdev_tty_init(NSCIF,scif),		/* 11: scif */
 	cdev_tty_init(NCOM,com),		/* 12: serial port */
-	cdev_lkm_dummy(),			/* 13: */
-	cdev_lkm_dummy(),			/* 14: */
-	cdev_lkm_dummy(),			/* 15: */
+	cdev_notdef(),				/* 13: */
+	cdev_notdef(),				/* 14: */
+	cdev_notdef(),				/* 15: */
 	cdev_disk_init(NWD,wd),			/* 16: ST506/ESDI/IDE disk */
-	cdev_lkm_dummy(),			/* 17: */
+	cdev_notdef(),				/* 17: */
 	cdev_disk_init(NRD,rd),			/* 18: ram disk driver */
 	cdev_disk_init(NVND,vnd),		/* 19: vnode disk driver */
-	cdev_lkm_dummy(),			/* 20: */
+	cdev_notdef(),				/* 20: */
 	cdev_notdef(),				/* 21: was: concatenated disk driver */
 	cdev_bpf_init(NBPFILTER,bpf),		/* 22: Berkeley packet filter */
-	cdev_lkm_dummy(),			/* 23: */
+	cdev_notdef(),				/* 23: */
 	cdev_disk_init(NSD,sd),			/* 24: SCSI disk */
 	cdev_tape_init(NST,st),			/* 25: SCSI tape */
 	cdev_disk_init(NCD,cd),			/* 26: SCSI CD-ROM */
 	cdev_ch_init(NCH,ch),	 		/* 27: SCSI autochanger */
 	cdev_uk_init(NUK,uk),	 		/* 28: SCSI unknown */
 	cdev_notdef(),				/* 29: */
-	cdev_lkm_dummy(),			/* 30: */
-	cdev_lkm_dummy(),			/* 31: */
-	cdev_lkm_dummy(),			/* 32: */
+	cdev_notdef(),				/* 30: */
+	cdev_notdef(),				/* 31: */
+	cdev_notdef(),				/* 32: */
 	cdev_tun_init(NTUN,tun),		/* 33: network tunnel */
-	cdev_lkm_dummy(),			/* 34: */
+	cdev_notdef(),				/* 34: */
 	cdev_notdef(),				/* 35: was LKM */
 	cdev_audio_init(NAUDIO,audio),		/* 36: generic audio I/O */
 	cdev_hotplug_init(NHOTPLUG,hotplug),	/* 37: devices hot plugging*/
 	cdev_bio_init(NBIO,bio),		/* 38: ioctl tunnel */
-	cdev_lkm_dummy(),			/* 39: reserved */
+	cdev_notdef(),				/* 39: reserved */
 	cdev_random_init(1,random),		/* 40: random generator */
-	cdev_lkm_dummy(),			/* 41: reserved */
-	cdev_lkm_dummy(),			/* 42: reserved */
-	cdev_lkm_dummy(),			/* 43: reserved */
-	cdev_lkm_dummy(),			/* 44: reserved */
-	cdev_lkm_dummy(),			/* 45: reserved */
+	cdev_notdef(),				/* 41: reserved */
+	cdev_notdef(),				/* 42: reserved */
+	cdev_notdef(),				/* 43: reserved */
+	cdev_notdef(),				/* 44: reserved */
+	cdev_notdef(),				/* 45: reserved */
 	cdev_pf_init(NPF,pf),           	/* 46: packet filter */
 	cdev_notdef(),				/* 47: was /dev/crypto */
-	cdev_lkm_dummy(),			/* 48: reserved */
-	cdev_lkm_dummy(),			/* 49: reserved */
+	cdev_notdef(),				/* 48: reserved */
+	cdev_notdef(),				/* 49: reserved */
 	cdev_systrace_init(NSYSTRACE,systrace),	/* 50: system call tracing */
 	cdev_notdef(),				/* 51: reserved */
 	cdev_notdef(),				/* 52: reserved */
 	cdev_notdef(),				/* 53: reserved */
 	cdev_notdef(),				/* 54: reserved */
-	cdev_lkm_dummy(),			/* 55: Reserved for bypass device */	
+	cdev_notdef(),				/* 55: Reserved for bypass device */	
 	cdev_notdef(),				/* 56: reserved */
 	cdev_midi_init(NMIDI,midi),		/* 57: MIDI I/O */
 	cdev_notdef(),				/* 58 was: sequencer I/O */
@@ -322,11 +322,11 @@ struct cdevsw cdevsw[] = {
 	cdev_notdef(),				/* 69: was USB scanners */
 	cdev_usbdev_init(NUGEN,ugen),		/* 70: USB generic driver */
 	cdev_notdef(),		    		/* 71 was: RAIDframe disk driver */
-	cdev_lkm_dummy(),			/* 72: reserved */
-	cdev_lkm_dummy(),			/* 73: reserved */
-	cdev_lkm_dummy(),			/* 74: reserved */
-	cdev_lkm_dummy(),			/* 75: reserved */
-	cdev_lkm_dummy(),			/* 76: reserved */
+	cdev_notdef(),				/* 72: reserved */
+	cdev_notdef(),				/* 73: reserved */
+	cdev_notdef(),				/* 74: reserved */
+	cdev_notdef(),				/* 75: reserved */
+	cdev_notdef(),				/* 76: reserved */
 	cdev_video_init(NVIDEO,video),		/* 77: generic video I/O */
 	cdev_notdef(),                          /* 78: removed device */
 	cdev_notdef(),                          /* 79: removed device */
diff --git a/sys/arch/luna88k/luna88k/conf.c b/sys/arch/luna88k/luna88k/conf.c
index b270435cc35..039f60f6c2d 100644
--- a/sys/arch/luna88k/luna88k/conf.c
+++ b/sys/arch/luna88k/luna88k/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.22 2014/10/09 03:59:59 tedu Exp $	*/
+/*	$OpenBSD: conf.c,v 1.23 2014/10/09 04:10:03 tedu Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -84,12 +84,12 @@ struct bdevsw	bdevsw[] =
 	bdev_notdef(),			/* 10 */
 	bdev_notdef(),			/* 11 */
 	bdev_notdef(),			/* 12 */
-	bdev_lkm_dummy(),		/* 13 */
-	bdev_lkm_dummy(),		/* 14 */
-	bdev_lkm_dummy(),		/* 15 */
-	bdev_lkm_dummy(),		/* 16 */
-	bdev_lkm_dummy(),		/* 17 */
-	bdev_lkm_dummy(),		/* 18 */
+	bdev_notdef(),			/* 13 */
+	bdev_notdef(),			/* 14 */
+	bdev_notdef(),			/* 15 */
+	bdev_notdef(),			/* 16 */
+	bdev_notdef(),			/* 17 */
+	bdev_notdef(),			/* 18 */
 };
 int	nblkdev = nitems(bdevsw);
 
@@ -130,12 +130,12 @@ struct cdevsw	cdevsw[] =
 	cdev_notdef(),			/* 30 */
 	cdev_notdef(),			/* 31 */
 	cdev_notdef(),			/* 32 */
-	cdev_lkm_dummy(),		/* 33 */
-	cdev_lkm_dummy(),		/* 34 */
-	cdev_lkm_dummy(),		/* 35 */
-	cdev_lkm_dummy(),		/* 36 */
-	cdev_lkm_dummy(),		/* 37 */
-	cdev_lkm_dummy(),		/* 38 */
+	cdev_notdef(),			/* 33 */
+	cdev_notdef(),			/* 34 */
+	cdev_notdef(),			/* 35 */
+	cdev_notdef(),			/* 36 */
+	cdev_notdef(),			/* 37 */
+	cdev_notdef(),			/* 38 */
 	cdev_pf_init(NPF,pf),		/* 39: packet filter */
 	cdev_random_init(1,random),	/* 40: random data source */
 	cdev_uk_init(NUK,uk),		/* 41 */
diff --git a/sys/arch/macppc/macppc/conf.c b/sys/arch/macppc/macppc/conf.c
index 2bc2c537f94..9a6ef4964d7 100644
--- a/sys/arch/macppc/macppc/conf.c
+++ b/sys/arch/macppc/macppc/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.60 2014/10/09 03:59:59 tedu Exp $ */
+/*	$OpenBSD: conf.c,v 1.61 2014/10/09 04:10:03 tedu Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom
@@ -61,12 +61,12 @@ struct bdevsw bdevsw[] = {
 	bdev_tape_init(NST,st),		/* 5 SCSI tape */
 	bdev_notdef(),			/* 6 unknown*/
 	bdev_notdef(),			/* 7 unknown*/
-	bdev_lkm_dummy(),		/* 8 */
-	bdev_lkm_dummy(),		/* 9 */
-	bdev_lkm_dummy(),		/* 10 */
-	bdev_lkm_dummy(),		/* 11 */
-	bdev_lkm_dummy(),		/* 12 */
-	bdev_lkm_dummy(),		/* 13 */
+	bdev_notdef(),			/* 8 */
+	bdev_notdef(),			/* 9 */
+	bdev_notdef(),			/* 10 */
+	bdev_notdef(),			/* 11 */
+	bdev_notdef(),			/* 12 */
+	bdev_notdef(),			/* 13 */
 	bdev_disk_init(NVND,vnd),	/* 14 vnode disk driver*/
 	bdev_notdef(),			/* 15 unknown*/
 	bdev_notdef(),			/* 16 was: concatenated disk driver*/
@@ -163,12 +163,12 @@ struct cdevsw cdevsw[] = {
 	cdev_notdef(),			/* 30 */
 	cdev_notdef(),			/* 31 */
 	cdev_notdef(),			/* 32 */
-	cdev_lkm_dummy(),		/* 33 */
-	cdev_lkm_dummy(),		/* 34 */
-	cdev_lkm_dummy(),		/* 35 */
-	cdev_lkm_dummy(),		/* 36 */
-	cdev_lkm_dummy(),		/* 37 */
-	cdev_lkm_dummy(),		/* 38 */
+	cdev_notdef(),			/* 33 */
+	cdev_notdef(),			/* 34 */
+	cdev_notdef(),			/* 35 */
+	cdev_notdef(),			/* 36 */
+	cdev_notdef(),			/* 37 */
+	cdev_notdef(),			/* 38 */
 	cdev_pf_init(NPF,pf),		/* 39: packet filter */
 	cdev_random_init(1,random),	/* 40: random data source */
 	cdev_uk_init(NUK,uk),		/* 41: unknown SCSI */
diff --git a/sys/arch/socppc/socppc/conf.c b/sys/arch/socppc/socppc/conf.c
index 28f318aff0c..a7f778da5f2 100644
--- a/sys/arch/socppc/socppc/conf.c
+++ b/sys/arch/socppc/socppc/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.21 2014/10/09 03:59:59 tedu Exp $ */
+/*	$OpenBSD: conf.c,v 1.22 2014/10/09 04:10:03 tedu Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom
@@ -59,12 +59,12 @@ struct bdevsw bdevsw[] = {
 	bdev_tape_init(NST,st),		/* 5 SCSI tape */
 	bdev_notdef(),			/* 6 unknown*/
 	bdev_notdef(),			/* 7 unknown*/
-	bdev_lkm_dummy(),		/* 8 */
-	bdev_lkm_dummy(),		/* 9 */
-	bdev_lkm_dummy(),		/* 10 */
-	bdev_lkm_dummy(),		/* 11 */
-	bdev_lkm_dummy(),		/* 12 */
-	bdev_lkm_dummy(),		/* 13 */
+	bdev_notdef(),			/* 8 */
+	bdev_notdef(),			/* 9 */
+	bdev_notdef(),			/* 10 */
+	bdev_notdef(),			/* 11 */
+	bdev_notdef(),			/* 12 */
+	bdev_notdef(),			/* 13 */
 	bdev_disk_init(NVND,vnd),	/* 14 vnode disk driver*/
 	bdev_notdef(),			/* 15 unknown*/
 	bdev_notdef(),			/* 16 was: concatenated disk driver */
@@ -145,12 +145,12 @@ struct cdevsw cdevsw[] = {
 	cdev_notdef(),			/* 30 */
 	cdev_notdef(),			/* 31 */
 	cdev_notdef(),			/* 32 */
-	cdev_lkm_dummy(),		/* 33 */
-	cdev_lkm_dummy(),		/* 34 */
-	cdev_lkm_dummy(),		/* 35 */
-	cdev_lkm_dummy(),		/* 36 */
-	cdev_lkm_dummy(),		/* 37 */
-	cdev_lkm_dummy(),		/* 38 */
+	cdev_notdef(),			/* 33 */
+	cdev_notdef(),			/* 34 */
+	cdev_notdef(),			/* 35 */
+	cdev_notdef(),			/* 36 */
+	cdev_notdef(),			/* 37 */
+	cdev_notdef(),			/* 38 */
 	cdev_pf_init(NPF,pf),		/* 39: packet filter */
 	cdev_random_init(1,random),	/* 40: random data source */
 	cdev_notdef(),			/* 41 */
diff --git a/sys/arch/sparc/sparc/conf.c b/sys/arch/sparc/sparc/conf.c
index b1fa55b6703..8ef73eca9f7 100644
--- a/sys/arch/sparc/sparc/conf.c
+++ b/sys/arch/sparc/sparc/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.63 2014/10/09 03:59:59 tedu Exp $	*/
+/*	$OpenBSD: conf.c,v 1.64 2014/10/09 04:10:03 tedu Exp $	*/
 /*	$NetBSD: conf.c,v 1.40 1996/04/11 19:20:03 thorpej Exp $ */
 
 /*
@@ -107,12 +107,12 @@ struct bdevsw	bdevsw[] =
 	bdev_disk_init(NFD,fd),		/* 16: floppy disk */
 	bdev_disk_init(NRD,rd),		/* 17: ram disk driver */
 	bdev_disk_init(NCD,cd),		/* 18: SCSI CD-ROM */
-	bdev_lkm_dummy(),		/* 19 */
-	bdev_lkm_dummy(),		/* 20 */
-	bdev_lkm_dummy(),		/* 21 */
-	bdev_lkm_dummy(),		/* 22 */
-	bdev_lkm_dummy(),		/* 23 */
-	bdev_lkm_dummy(),		/* 24 */
+	bdev_notdef(),			/* 19 */
+	bdev_notdef(),			/* 20 */
+	bdev_notdef(),			/* 21 */
+	bdev_notdef(),			/* 22 */
+	bdev_notdef(),			/* 23 */
+	bdev_notdef(),			/* 24 */
 	bdev_notdef(),			/* 25 was: RAIDframe disk driver */
 	bdev_disk_init(NPRESTO,presto),	/* 26: Prestoserve NVRAM */
 };
@@ -246,12 +246,12 @@ struct cdevsw	cdevsw[] =
 	cdev_disk_init(NVND,vnd),	/* 110: vnode disk driver */
 	cdev_tun_init(NTUN,tun),	/* 111: network tunnel */
 	cdev_notdef(),			/* 112: was LKM */
-	cdev_lkm_dummy(),		/* 113 */
-	cdev_lkm_dummy(),		/* 114 */
-	cdev_lkm_dummy(),		/* 115 */
-	cdev_lkm_dummy(),		/* 116 */
-	cdev_lkm_dummy(),		/* 117 */
-	cdev_lkm_dummy(),		/* 118 */
+	cdev_notdef(),			/* 113 */
+	cdev_notdef(),			/* 114 */
+	cdev_notdef(),			/* 115 */
+	cdev_notdef(),			/* 116 */
+	cdev_notdef(),			/* 117 */
+	cdev_notdef(),			/* 118 */
 	cdev_random_init(1,random),	/* 119: random generator */
 	cdev_uk_init(NUK,uk),		/* 120: unknown SCSI */
 	cdev_notdef(),			/* 121 */
diff --git a/sys/arch/sparc64/sparc64/conf.c b/sys/arch/sparc64/sparc64/conf.c
index e88b9443794..1505e5a3f51 100644
--- a/sys/arch/sparc64/sparc64/conf.c
+++ b/sys/arch/sparc64/sparc64/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.72 2014/10/09 03:59:59 tedu Exp $	*/
+/*	$OpenBSD: conf.c,v 1.73 2014/10/09 04:10:03 tedu Exp $	*/
 /*	$NetBSD: conf.c,v 1.17 2001/03/26 12:33:26 lukem Exp $ */
 
 /*
@@ -139,12 +139,12 @@ struct bdevsw	bdevsw[] =
 	bdev_disk_init(NFD,fd),		/* 16: floppy disk */
 	bdev_notdef(),			/* 17 */
 	bdev_disk_init(NCD,cd),		/* 18: SCSI CD-ROM */
-	bdev_lkm_dummy(),		/* 19 */
-	bdev_lkm_dummy(),		/* 20 */
-	bdev_lkm_dummy(),		/* 21 */
-	bdev_lkm_dummy(),		/* 22 */
-	bdev_lkm_dummy(),		/* 23 */
-	bdev_lkm_dummy(),		/* 24 */
+	bdev_notdef(),			/* 19 */
+	bdev_notdef(),			/* 20 */
+	bdev_notdef(),			/* 21 */
+	bdev_notdef(),			/* 22 */
+	bdev_notdef(),			/* 23 */
+	bdev_notdef(),			/* 24 */
 	bdev_notdef(),			/* 25 was: RAIDframe disk driver */
 };
 int	nblkdev = nitems(bdevsw);
@@ -269,12 +269,12 @@ struct cdevsw	cdevsw[] =
 	cdev_disk_init(NVND,vnd),	/* 110: vnode disk driver */
 	cdev_tun_init(NTUN,tun),	/* 111: network tunnel */
 	cdev_notdef(),			/* 112 was LKM */
-	cdev_lkm_dummy(),		/* 113 */
-	cdev_lkm_dummy(),		/* 114 */
-	cdev_lkm_dummy(),		/* 115 */
-	cdev_lkm_dummy(),		/* 116 */
-	cdev_lkm_dummy(),		/* 117 */
-	cdev_lkm_dummy(),		/* 118 */
+	cdev_notdef(),			/* 113 */
+	cdev_notdef(),			/* 114 */
+	cdev_notdef(),			/* 115 */
+	cdev_notdef(),			/* 116 */
+	cdev_notdef(),			/* 117 */
+	cdev_notdef(),			/* 118 */
 	cdev_random_init(1,random),	/* 119: random data source */
 	cdev_bio_init(NBIO,bio),	/* 120: ioctl tunnel */
 	cdev_notdef(),			/* 121 was: RAIDframe disk driver */