back out bio, breaks dlg's sparc64 v215

prompted by/ok dlg@ deraadt@

19 files changed, 36 insertions, 59 deletions

diff --git a/sys/arch/alpha/alpha/conf.c b/sys/arch/alpha/alpha/conf.c
index 8996e4b9a45..77cce6c4fc8 100644
--- a/sys/arch/alpha/alpha/conf.c
+++ b/sys/arch/alpha/alpha/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.52 2007/05/26 19:54:24 todd Exp $	*/
+/*	$OpenBSD: conf.c,v 1.53 2007/05/27 01:50:36 todd Exp $	*/
 /*	$NetBSD: conf.c,v 1.16 1996/10/18 21:26:57 cgd Exp $	*/
 
 /*-
@@ -104,7 +104,6 @@ cdev_decl(music);
 #include "spkr.h"
 cdev_decl(spkr);
 
-#include "bio.h"
 #include "lpt.h"
 cdev_decl(lpt);
 cdev_decl(prom);			/* XXX XXX XXX */
@@ -179,7 +178,7 @@ struct cdevsw	cdevsw[] =
 	cdev_midi_init(NMIDI,midi),     /* 41: MIDI I/O */
         cdev_midi_init(NSEQUENCER,sequencer),   /* 42: sequencer I/O */
 	cdev_disk_init(NRAID,raid),	/* 43: RAIDframe disk driver */
-	cdev_bio_init(NBIO,bio),	/* 44: ioctl tunnel */
+	cdev_notdef(),			/* 44 */
 	cdev_usb_init(NUSB,usb),	/* 45: USB controller */
 	cdev_usbdev_init(NUHID,uhid),	/* 46: USB generic HID */
 	cdev_ulpt_init(NULPT,ulpt),	/* 47: USB printer */
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 9a0dbe0c977..453cd64a42f 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.183 2007/05/26 19:54:24 todd Exp $
+#	$OpenBSD: GENERIC,v 1.184 2007/05/27 01:50:36 todd Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -517,6 +517,7 @@ owtemp* at onewire?		# Temperature
 
 pseudo-device	sequencer	1
 #pseudo-device	raid		4	# RAIDframe disk driver
+pseudo-device	bio		1	# ioctl multiplexing device
 pseudo-device	hotplug		1	# devices hot plugging
 
 # mouse & keyboard multiplexor pseudo-devices
diff --git a/sys/arch/arm/arm/conf.c b/sys/arch/arm/arm/conf.c
index 0568f3a77da..46100b42ece 100644
--- a/sys/arch/arm/arm/conf.c
+++ b/sys/arch/arm/arm/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.14 2007/05/26 19:54:24 todd Exp $	*/
+/*	$OpenBSD: conf.c,v 1.15 2007/05/27 01:50:36 todd Exp $	*/
 /*	$NetBSD: conf.c,v 1.10 2002/04/19 01:04:38 wiz Exp $	*/
 
 /*
@@ -113,7 +113,6 @@ cdev_decl(pci);
 #include "ch.h"
 #include "uk.h"
 #include "ss.h"
-#include "bio.h"
 
 /*
  * Audio devices
@@ -391,11 +390,7 @@ struct cdevsw cdevsw[] = {
 	cdev_notdef(),                          /* 93: removed device */
 	cdev_notdef(),                          /* 94: removed device */
 	cdev_notdef(),                          /* 95: removed device */
-#ifdef __zaurus__
-	cdev_disk_init(NFLASH,flash),		/* 96: flash ROM devices */
-#else
 	cdev_notdef(),                          /* 96: removed device */
-#endif
 	cdev_radio_init(NRADIO,radio),		/* 97: generic radio I/O */
 	cdev_ptm_init(NPTY,ptm),		/* 98: pseudo-tty ptm device */
 	cdev_spkr_init(NSPKR,spkr),		/* 99: PC speaker */
@@ -537,11 +532,7 @@ int chrtoblktbl[] = {
     /* 93 */	    NODEV,
     /* 94 */	    NODEV,
     /* 95 */	    NODEV,
-#ifdef __zaurus__
-    /* 96 */	    96,
-#else
     /* 96 */	    NODEV,
-#endif
     /* 97 */	    NODEV,
 };
 int nchrtoblktbl = sizeof(chrtoblktbl) / sizeof(chrtoblktbl[0]);
diff --git a/sys/arch/aviion/aviion/conf.c b/sys/arch/aviion/aviion/conf.c
index 5335ba5367e..ac7323e8225 100644
--- a/sys/arch/aviion/aviion/conf.c
+++ b/sys/arch/aviion/aviion/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.2 2007/05/26 19:54:24 todd Exp $	*/
+/*	$OpenBSD: conf.c,v 1.3 2007/05/27 01:50:36 todd Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -48,7 +48,6 @@
 #include "ksyms.h"
 #include "nvram.h"
 #include "pf.h"
-#include "bio.h"
 #include "pty.h"
 #include "rd.h"
 #include "sd.h"
@@ -97,7 +96,7 @@ struct cdevsw	cdevsw[] =
 	cdev_tty_init(NPTY,pts),	/* 4: pseudo-tty slave */
 	cdev_ptc_init(NPTY,ptc),	/* 5: pseudo-tty master */
 	cdev_log_init(1,log),		/* 6: /dev/klog */
-	cdev_bio_init(NBIO,bio),	/* 7: ioctl tunnel */
+	cdev_notdef(),			/* 7: /dev/sramX */
 	cdev_disk_init(NSD,sd),		/* 8: SCSI disk */
 	cdev_disk_init(NCD,cd),		/* 9: SCSI CD-ROM */
 	cdev_mm_init(NNVRAM,nvram),	/* 10: /dev/nvramX */
diff --git a/sys/arch/hp300/hp300/conf.c b/sys/arch/hp300/hp300/conf.c
index cc2ef2924e8..eb03b4f684c 100644
--- a/sys/arch/hp300/hp300/conf.c
+++ b/sys/arch/hp300/hp300/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.39 2007/05/26 19:54:24 todd Exp $	*/
+/*	$OpenBSD: conf.c,v 1.40 2007/05/27 01:50:36 todd Exp $	*/
 /*	$NetBSD: conf.c,v 1.39 1997/05/12 08:17:53 thorpej Exp $	*/
 
 /*-
@@ -83,7 +83,6 @@ int	nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
 	dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) nullop, \
 	0, (dev_type_poll((*))) enodev, (dev_type_mmap((*))) enodev }
 
-#include "bio.h"
 #define	mmread	mmrw
 #define	mmwrite	mmrw
 cdev_decl(mm);
@@ -126,7 +125,7 @@ struct cdevsw	cdevsw[] =
 	cdev_tape_init(NCT,ct),		/* 7: cs80 cartridge tape */
 	cdev_disk_init(NSD,sd),		/* 8: SCSI disk */
 	cdev_disk_init(NHD,hd),		/* 9: HPIB disk */
-	cdev_bio_init(NBIO,bio),	/* 10: ioctl tunnel */
+	cdev_notdef(),			/* 10: vas frame buffer */
 	cdev_ppi_init(NPPI,ppi),	/* 11: printer/plotter interface */
 	cdev_tty_init(NDCA,dca),	/* 12: built-in single-port serial */
 	cdev_notdef(),			/* 13: was console terminal emulator */
diff --git a/sys/arch/hppa/hppa/conf.c b/sys/arch/hppa/hppa/conf.c
index ed401b552e9..1ee10840947 100644
--- a/sys/arch/hppa/hppa/conf.c
+++ b/sys/arch/hppa/hppa/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.38 2007/05/26 19:54:24 todd Exp $	*/
+/*	$OpenBSD: conf.c,v 1.39 2007/05/27 01:50:36 todd Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -81,7 +81,6 @@ struct bdevsw   bdevsw[] =
 int	nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
 
 #include "audio.h"
-#include "bio.h"
 #include "pty.h"
 #include "wsdisplay.h"
 #include "wskbd.h"
@@ -170,7 +169,7 @@ struct cdevsw   cdevsw[] =
 	cdev_systrace_init(NSYSTRACE,systrace),	/* 34: system call tracing */
 	cdev_audio_init(NAUDIO,audio),	/* 35: /dev/audio */
 	cdev_crypto_init(NCRYPTO,crypto), /* 36: /dev/crypto */
-	cdev_bio_init(NBIO,bio),	/* 37: ioctl tunnel */
+	cdev_notdef(),			/* 37: */
 	cdev_ptm_init(NPTY,ptm),	/* 38: pseudo-tty ptm device */
 	cdev_disk_init(NWD,wd),		/* 39: ST506 disk */
 	cdev_usb_init(NUSB,usb),	/* 40: USB controller */
diff --git a/sys/arch/hppa64/hppa64/conf.c b/sys/arch/hppa64/hppa64/conf.c
index 57fc58ba8d4..b55c85163a4 100644
--- a/sys/arch/hppa64/hppa64/conf.c
+++ b/sys/arch/hppa64/hppa64/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.4 2007/05/26 19:54:24 todd Exp $	*/
+/*	$OpenBSD: conf.c,v 1.5 2007/05/27 01:50:36 todd Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -82,7 +82,6 @@ struct bdevsw   bdevsw[] =
 int	nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
 
 #include "audio.h"
-#include "bio.h"
 #include "pty.h"
 #include "wsdisplay.h"
 #include "wskbd.h"
@@ -162,7 +161,7 @@ struct cdevsw   cdevsw[] =
 	cdev_systrace_init(NSYSTRACE,systrace),	/* 34: system call tracing */
 	cdev_audio_init(NAUDIO,audio),	/* 35: /dev/audio */
 	cdev_crypto_init(NCRYPTO,crypto), /* 36: /dev/crypto */
-	cdev_bio_init(NBIO,bio),	/* 37: ioctl tunnel */
+	cdev_notdef(),			/* 37 */
 	cdev_ptm_init(NPTY,ptm),	/* 38: pseudo-tty ptm device */
 	cdev_disk_init(NWD,wd),		/* 39: ST506 disk */
 	cdev_lkm_dummy(),
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index f4d41507b3f..f3e9dfefc0f 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.557 2007/05/26 19:54:24 todd Exp $
+#	$OpenBSD: GENERIC,v 1.558 2007/05/27 01:50:36 todd Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -719,6 +719,7 @@ pseudo-device	mtrr		1	# Memory range attributes control
 pseudo-device	nvram		1
 pseudo-device	sequencer	1
 #pseudo-device	raid		4	# RAIDframe disk driver
+pseudo-device	bio		1	# ioctl multiplexing device
 pseudo-device	hotplug		1	# devices hot plugging
 
 # mouse & keyboard multiplexor pseudo-devices
diff --git a/sys/arch/landisk/landisk/conf.c b/sys/arch/landisk/landisk/conf.c
index e6c55f6f68e..a7cfa2e6ceb 100644
--- a/sys/arch/landisk/landisk/conf.c
+++ b/sys/arch/landisk/landisk/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.4 2007/05/26 19:54:24 todd Exp $	*/
+/*	$OpenBSD: conf.c,v 1.5 2007/05/27 01:50:36 todd Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -70,7 +70,6 @@
  */
 #include "bpfilter.h"
 #include "pf.h"
-#include "bio.h"
 #include "pty.h"
 #include "tun.h"
 #include "ksyms.h"
@@ -318,7 +317,7 @@ struct cdevsw cdevsw[] = {
 	cdev_lkm_init(NLKM,lkm),		/* 35: loadable module driver */
 	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: removed cpu device */
+	cdev_notdef(),				/* 38: removed cpu device */
 	cdev_lkm_dummy(),			/* 39: reserved */
 	cdev_random_init(1,random),		/* 40: random generator */
 	cdev_lkm_dummy(),			/* 41: reserved */
diff --git a/sys/arch/luna88k/luna88k/conf.c b/sys/arch/luna88k/luna88k/conf.c
index f2957acd5f6..eff53fd5112 100644
--- a/sys/arch/luna88k/luna88k/conf.c
+++ b/sys/arch/luna88k/luna88k/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.5 2007/05/26 19:54:24 todd Exp $	*/
+/*	$OpenBSD: conf.c,v 1.6 2007/05/27 01:50:36 todd Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -40,7 +40,6 @@
 
 #include <machine/conf.h>
 
-#include "bio.h"
 #include "pty.h"
 #include "bpfilter.h"
 #include "tun.h"
@@ -104,7 +103,7 @@ struct cdevsw	cdevsw[] =
 	cdev_tty_init(NPTY,pts),	/* 4: pseudo-tty slave */
 	cdev_ptc_init(NPTY,ptc),	/* 5: pseudo-tty master */
 	cdev_log_init(1,log),		/* 6: /dev/klog */
-	cdev_bio_init(NBIO,bio),	/* 7: ioctl tunnel */
+	cdev_notdef(),			/* 7: */
 	cdev_disk_init(NSD,sd),		/* 8: SCSI disk */
 	cdev_disk_init(NCD,cd),		/* 9: SCSI CD-ROM */
 	cdev_lcd_init(NLCD,lcd),	/* 10: /dev/lcd */
diff --git a/sys/arch/mac68k/mac68k/conf.c b/sys/arch/mac68k/mac68k/conf.c
index b41839f7729..98e563fd249 100644
--- a/sys/arch/mac68k/mac68k/conf.c
+++ b/sys/arch/mac68k/mac68k/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.37 2007/05/26 19:54:24 todd Exp $	*/
+/*	$OpenBSD: conf.c,v 1.38 2007/05/27 01:50:36 todd Exp $	*/
 /*	$NetBSD: conf.c,v 1.41 1997/02/11 07:35:49 scottr Exp $	*/
 
 /*
@@ -79,7 +79,6 @@ int	nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
 #define mmread	mmrw
 #define mmwrite	mmrw
 cdev_decl(mm);
-#include "bio.h"
 #include "pty.h"
 #include "ss.h"
 #include "uk.h"
@@ -115,7 +114,7 @@ struct cdevsw	cdevsw[] =
 	cdev_tty_init(NPTY,pts),	/* 4: pseudo-tty slave */
 	cdev_ptc_init(NPTY,ptc),	/* 5: pseudo-tty master */
 	cdev_log_init(1,log),		/* 6: /dev/klog */
-	cdev_bio_init(NBIO,bio),	/* 7: ioctl tunnel */
+	cdev_notdef(),			/* 7 */
 	cdev_notdef(),			/* 8 */
 	cdev_notdef(),			/* 9 */
 	cdev_notdef(),			/* 10 was GRF */
diff --git a/sys/arch/mvme68k/mvme68k/conf.c b/sys/arch/mvme68k/mvme68k/conf.c
index ea22077c05f..dd6653564ca 100644
--- a/sys/arch/mvme68k/mvme68k/conf.c
+++ b/sys/arch/mvme68k/mvme68k/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.39 2007/05/26 19:54:24 todd Exp $ */
+/*	$OpenBSD: conf.c,v 1.40 2007/05/27 01:50:36 todd Exp $ */
 
 /*-
  * Copyright (c) 1995 Theo de Raadt
@@ -111,7 +111,6 @@ int	nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
 #include "nvram.h"
 #include "flash.h"
 
-#include "bio.h"
 #include "pty.h"
 cdev_decl(fd);
 
@@ -168,7 +167,7 @@ struct cdevsw	cdevsw[] =
 	cdev_mdev_init(NFLASH,flash),	/* 11: /dev/flashX */
 	cdev_tty_init(NZS,zs),		/* 12: SCC serial (tty[a-d]) */
 	cdev_tty_init(NCL,cl),		/* 13: CL-CD2400 serial (tty0[0-3]) */
-	cdev_bio_init(NBIO,bio),	/* 14: ioctl tunnel */
+	cdev_notdef(),			/* 14 */
 	cdev_notdef(),			/* 15 */
 	cdev_notdef(),			/* 16 */
 	cdev_disk_init(NCCD,ccd),	/* 17: concatenated disk */
diff --git a/sys/arch/mvme88k/mvme88k/conf.c b/sys/arch/mvme88k/mvme88k/conf.c
index a858cb4f6da..4aac6ea9403 100644
--- a/sys/arch/mvme88k/mvme88k/conf.c
+++ b/sys/arch/mvme88k/mvme88k/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.32 2007/05/26 19:54:24 todd Exp $	*/
+/*	$OpenBSD: conf.c,v 1.33 2007/05/27 01:50:36 todd Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -40,7 +40,6 @@
 
 #include <machine/conf.h>
 
-#include "bio.h"
 #include "pty.h"
 #include "bpfilter.h"
 #include "tun.h"
@@ -149,7 +148,7 @@ struct cdevsw	cdevsw[] =
 #endif /* notyet */
 	cdev_tty_init(NDART,dart),	/* 12: MVME188 serial (tty[a-b]) */
 	cdev_tty_init(NCL,cl),		/* 13: CL-CD1400 serial (tty0[0-3]) */
-	cdev_bio_init(NBIO,bio),	/* 14: ioctl tunnel */
+	cdev_notdef(),			/* 14 */
 	cdev_tty_init(NVX,vx),		/* 15: MVME332XT serial/lpt ttyv[0-7][a-i] */
 	cdev_notdef(),			/* 16 */
 	cdev_disk_init(NCCD,ccd),	/* 17: concatenated disk */
diff --git a/sys/arch/mvmeppc/mvmeppc/conf.c b/sys/arch/mvmeppc/mvmeppc/conf.c
index 0f36a6a9012..fffec58c04b 100644
--- a/sys/arch/mvmeppc/mvmeppc/conf.c
+++ b/sys/arch/mvmeppc/mvmeppc/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.18 2007/05/26 19:54:24 todd Exp $ */
+/*	$OpenBSD: conf.c,v 1.19 2007/05/27 01:50:36 todd Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom
@@ -84,7 +84,6 @@ struct bdevsw bdevsw[] = {
 };
 int nblkdev = sizeof bdevsw / sizeof bdevsw[0];
 
-#include "bio.h"
 #include "pty.h"
 
 #include "bugtty.h"
@@ -134,7 +133,7 @@ struct cdevsw cdevsw[] = {
         cdev_disk_init(NCD,cd),         /* 9: SCSI CD-ROM */
         cdev_notdef(),                  /* 10: SCSI changer */
 	cdev_disk_init(NWD,wd),		/* 11: ST506/ESDI/IDE disk */
-        cdev_bio_init(NBIO,bio),	/* 12: ioctl tunnel */
+        cdev_notdef(),                  /* 12 */
 	cdev_notdef(),			/* 13 */
 	cdev_tty_init(NBUGTTY,bugtty),  /* 14: BUGtty (ttyB) */
         cdev_notdef(),                  /* 15 */
diff --git a/sys/arch/sgi/sgi/conf.c b/sys/arch/sgi/sgi/conf.c
index e39ed5b25ea..907547ef2c0 100644
--- a/sys/arch/sgi/sgi/conf.c
+++ b/sys/arch/sgi/sgi/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.10 2007/05/26 19:54:24 todd Exp $ */
+/*	$OpenBSD: conf.c,v 1.11 2007/05/27 01:50:36 todd Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -93,7 +93,6 @@ int	nblkdev = sizeof (bdevsw) / sizeof (bdevsw[0]);
 #define mmwrite mmrw
 dev_type_read(mmrw);
 cdev_decl(mm);
-#include "bio.h"
 #include "pty.h"
 cdev_decl(fd);
 #include "st.h"
@@ -142,7 +141,7 @@ struct cdevsw	cdevsw[] =
 	cdev_disk_init(NVND,vnd),	/* 11: vnode disk */
 	cdev_bpftun_init(NBPFILTER,bpf),/* 12: berkeley packet filter */
 	cdev_bpftun_init(NTUN,tun),	/* 13: network tunnel */
-	cdev_bio_init(NBIO,bio),	/* 14: ioctl tunnel */
+	cdev_notdef(),			/* 14: */
 	cdev_notdef(),			/* 15: */
 	cdev_lpt_init(NLPT,lpt),	/* 16: Parallel printer interface */
 	cdev_tty_init(NCOM,com),	/* 17: 16C450 serial interface */
diff --git a/sys/arch/sparc/sparc/conf.c b/sys/arch/sparc/sparc/conf.c
index 6f2848741e0..e3aba13edbf 100644
--- a/sys/arch/sparc/sparc/conf.c
+++ b/sys/arch/sparc/sparc/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.44 2007/05/26 19:54:24 todd Exp $	*/
+/*	$OpenBSD: conf.c,v 1.45 2007/05/27 01:50:36 todd Exp $	*/
 /*	$NetBSD: conf.c,v 1.40 1996/04/11 19:20:03 thorpej Exp $ */
 
 /*
@@ -51,7 +51,6 @@
 
 #include <machine/conf.h>
 
-#include "bio.h"
 #include "pty.h"
 #include "bpfilter.h"
 #include "tun.h"
@@ -135,7 +134,7 @@ struct cdevsw	cdevsw[] =
 	cdev_notdef(),			/* 1 */
 	cdev_ctty_init(1,ctty),		/* 2: controlling terminal */
 	cdev_mm_init(1,mm),		/* 3: /dev/{null,mem,kmem,...} */
-	cdev_bio_init(NBIO,bio),	/* 4: ioctl tunnel */
+	cdev_notdef(),			/* 4 */
 	cdev_notdef(),			/* 5 */
 	cdev_notdef(),			/* 6 */
 	cdev_swap_init(1,sw),		/* 7: /dev/drum (swap pseudo-device) */
diff --git a/sys/arch/sparc64/sparc64/conf.c b/sys/arch/sparc64/sparc64/conf.c
index 9234161cc9c..d07c8a1e267 100644
--- a/sys/arch/sparc64/sparc64/conf.c
+++ b/sys/arch/sparc64/sparc64/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.42 2007/05/26 19:54:24 todd Exp $	*/
+/*	$OpenBSD: conf.c,v 1.43 2007/05/27 01:50:36 todd Exp $	*/
 /*	$NetBSD: conf.c,v 1.17 2001/03/26 12:33:26 lukem Exp $ */
 
 /*
@@ -51,7 +51,6 @@
 
 #include <machine/conf.h>
 
-#include "bio.h"
 #include "pty.h"
 #include "bpfilter.h"
 #include "tun.h"
@@ -152,7 +151,7 @@ struct cdevsw	cdevsw[] =
 	cdev_notdef(),			/* 1: tapemaster tape */
 	cdev_ctty_init(1,ctty),		/* 2: controlling terminal */
 	cdev_mm_init(1,mm),		/* 3: /dev/{null,mem,kmem,...} */
-	cdev_bio_init(NBIO,bio),	/* 4: ioctl tunnel */
+	cdev_notdef(),			/* 4 */
 	cdev_notdef(),			/* 5: tapemaster tape */
 	cdev_notdef(),			/* 6: systech/versatec */
 	cdev_swap_init(1,sw),		/* 7: /dev/drum (swap pseudo-device) */
diff --git a/sys/arch/vax/vax/conf.c b/sys/arch/vax/vax/conf.c
index 65954d420ff..b8da36d8e88 100644
--- a/sys/arch/vax/vax/conf.c
+++ b/sys/arch/vax/vax/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.50 2007/05/26 19:54:24 todd Exp $ */
+/*	$OpenBSD: conf.c,v 1.51 2007/05/27 01:50:36 todd Exp $ */
 /*	$NetBSD: conf.c,v 1.44 1999/10/27 16:38:54 ragge Exp $	*/
 
 /*-
@@ -229,7 +229,6 @@ struct	consdev constab[]={
 #define mmread	mmrw
 #define mmwrite mmrw
 cdev_decl(mm);
-#include "bio.h"
 #include "pty.h"
 
 cdev_decl(hp);
@@ -362,7 +361,7 @@ struct cdevsw	cdevsw[] =
 	cdev_ctty_init(1,ctty),		/* 2: controlling terminal */
 	cdev_mm_init(1,mm),		/* 3: /dev/{null,mem,kmem,...} */
 	cdev_disk_init(NHP,hp),		/* 4: Massbuss disk */
-	cdev_bio_init(NBIO,bio),	/* 5: ioctl tunnel */
+	cdev_notdef(),			/* 5 */
 	cdev_plotter_init(NVP,vp),	/* 6: Versatec plotter */
 	cdev_swap_init(1,sw),		/* 7 */
 	cdev_cnstore_init(NCFL,cfl),	/* 8: 11/780 console floppy */
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC
index 9795bbe69dd..bfba2e39921 100644
--- a/sys/conf/GENERIC
+++ b/sys/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.129 2007/05/26 19:54:24 todd Exp $
+#	$OpenBSD: GENERIC,v 1.130 2007/05/27 01:50:37 todd Exp $
 #
 #	Machine-independent option; used by all architectures for their
 #	GENERIC kernel
@@ -103,6 +103,5 @@ pseudo-device	trunk		# Trunking support
 #pseudo-device	faith	1	# IPv[46] tcp relay translation i/f
 
 pseudo-device	pppoe	1	# PPP over Ethernet (RFC 2516)
-pseudo-device	bio	1	# ioctl multiplexing device
 
 option		BOOT_CONFIG	# add support for boot -c