summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/alpha/alpha/conf.c5
-rw-r--r--sys/arch/amd64/conf/GENERIC3
-rw-r--r--sys/arch/arm/arm/conf.c5
-rw-r--r--sys/arch/aviion/aviion/conf.c7
-rw-r--r--sys/arch/hp300/hp300/conf.c7
-rw-r--r--sys/arch/hppa/hppa/conf.c5
-rw-r--r--sys/arch/hppa64/hppa64/conf.c5
-rw-r--r--sys/arch/i386/conf/GENERIC3
-rw-r--r--sys/arch/landisk/landisk/conf.c5
-rw-r--r--sys/arch/luna88k/luna88k/conf.c7
-rw-r--r--sys/arch/mac68k/mac68k/conf.c5
-rw-r--r--sys/arch/mvme68k/mvme68k/conf.c5
-rw-r--r--sys/arch/mvme88k/mvme88k/conf.c5
-rw-r--r--sys/arch/mvmeppc/mvmeppc/conf.c7
-rw-r--r--sys/arch/sgi/sgi/conf.c7
-rw-r--r--sys/arch/sparc/sparc/conf.c5
-rw-r--r--sys/arch/sparc64/sparc64/conf.c5
-rw-r--r--sys/arch/vax/vax/conf.c5
-rw-r--r--sys/conf/GENERIC3
19 files changed, 57 insertions, 42 deletions
diff --git a/sys/arch/alpha/alpha/conf.c b/sys/arch/alpha/alpha/conf.c
index 77cce6c4fc8..23c5e155c07 100644
--- a/sys/arch/alpha/alpha/conf.c
+++ b/sys/arch/alpha/alpha/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.53 2007/05/27 01:50:36 todd Exp $ */
+/* $OpenBSD: conf.c,v 1.54 2007/05/28 22:26:03 todd Exp $ */
/* $NetBSD: conf.c,v 1.16 1996/10/18 21:26:57 cgd Exp $ */
/*-
@@ -104,6 +104,7 @@ cdev_decl(music);
#include "spkr.h"
cdev_decl(spkr);
+#include "bio.h"
#include "lpt.h"
cdev_decl(lpt);
cdev_decl(prom); /* XXX XXX XXX */
@@ -195,7 +196,7 @@ struct cdevsw cdevsw[] =
#else
cdev_notdef(),
#endif
- cdev_notdef(), /* 53: ALTQ (deprecated) */
+ cdev_bio_init(NBIO,bio), /* 53: ioctl tunnel */
cdev_iop_init(NIOP, iop), /* 54: I2O IOP control interface */
cdev_ptm_init(NPTY,ptm), /* 55: pseudo-tty ptm device */
cdev_hotplug_init(NHOTPLUG,hotplug), /* 56: devices hot plugging */
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index d49953aafee..61d74f3be76 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.185 2007/05/27 14:45:23 grange Exp $
+# $OpenBSD: GENERIC,v 1.186 2007/05/28 22:26:03 todd Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -517,7 +517,6 @@ 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 46100b42ece..47ea6e3f789 100644
--- a/sys/arch/arm/arm/conf.c
+++ b/sys/arch/arm/arm/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.15 2007/05/27 01:50:36 todd Exp $ */
+/* $OpenBSD: conf.c,v 1.16 2007/05/28 22:26:03 todd Exp $ */
/* $NetBSD: conf.c,v 1.10 2002/04/19 01:04:38 wiz Exp $ */
/*
@@ -113,6 +113,7 @@ cdev_decl(pci);
#include "ch.h"
#include "uk.h"
#include "ss.h"
+#include "bio.h"
/*
* Audio devices
@@ -342,7 +343,7 @@ struct cdevsw cdevsw[] = {
#else
cdev_notdef(), /* 51: reserved */
#endif
- cdev_notdef(), /* 52: reserved */
+ cdev_bio_init(NBIO,bio), /* 52: ioctl tunnel */
cdev_notdef(), /* 53: reserved */
cdev_tty_init(NFCOM,fcom), /* 54: FOOTBRIDGE console */
cdev_lkm_dummy(), /* 55: Reserved for bypass device */
diff --git a/sys/arch/aviion/aviion/conf.c b/sys/arch/aviion/aviion/conf.c
index ac7323e8225..ba0dc2bb36a 100644
--- a/sys/arch/aviion/aviion/conf.c
+++ b/sys/arch/aviion/aviion/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.3 2007/05/27 01:50:36 todd Exp $ */
+/* $OpenBSD: conf.c,v 1.4 2007/05/28 22:26:03 todd Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -48,6 +48,7 @@
#include "ksyms.h"
#include "nvram.h"
#include "pf.h"
+#include "bio.h"
#include "pty.h"
#include "rd.h"
#include "sd.h"
@@ -96,7 +97,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_notdef(), /* 7: /dev/sramX */
+ cdev_notdef(), /* 7 */
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 */
@@ -138,7 +139,7 @@ struct cdevsw cdevsw[] =
cdev_notdef(), /* 46 */
cdev_notdef(), /* 47 */
cdev_notdef(), /* 48 */
- cdev_notdef(), /* 49 */
+ cdev_bio_init(NBIO,bio), /* 49: ioctl tunnel */
cdev_systrace_init(NSYSTRACE,systrace), /* 50 system call tracing */
#ifdef XFS
cdev_xfs_init(NXFS,xfs_dev), /* 51: xfs communication device */
diff --git a/sys/arch/hp300/hp300/conf.c b/sys/arch/hp300/hp300/conf.c
index eb03b4f684c..b3749fc57bc 100644
--- a/sys/arch/hp300/hp300/conf.c
+++ b/sys/arch/hp300/hp300/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.40 2007/05/27 01:50:36 todd Exp $ */
+/* $OpenBSD: conf.c,v 1.41 2007/05/28 22:26:03 todd Exp $ */
/* $NetBSD: conf.c,v 1.39 1997/05/12 08:17:53 thorpej Exp $ */
/*-
@@ -83,6 +83,7 @@ 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);
@@ -125,7 +126,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_notdef(), /* 10: vas frame buffer */
+ cdev_notdef(), /* 10 */
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 */
@@ -164,7 +165,7 @@ struct cdevsw cdevsw[] =
cdev_notdef(), /* 46 */
cdev_notdef(), /* 47 */
cdev_notdef(), /* 48 */
- cdev_notdef(), /* 49 */
+ cdev_bio_init(NBIO,bio), /* 49: ioctl tunnel */
cdev_systrace_init(NSYSTRACE,systrace), /* 50 system call tracing */
#ifdef XFS
cdev_xfs_init(NXFS,xfs_dev), /* 51: xfs communication device */
diff --git a/sys/arch/hppa/hppa/conf.c b/sys/arch/hppa/hppa/conf.c
index 1ee10840947..3b55707e607 100644
--- a/sys/arch/hppa/hppa/conf.c
+++ b/sys/arch/hppa/hppa/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.39 2007/05/27 01:50:36 todd Exp $ */
+/* $OpenBSD: conf.c,v 1.40 2007/05/28 22:26:03 todd Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -81,6 +81,7 @@ 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"
@@ -169,7 +170,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_notdef(), /* 37: */
+ cdev_bio_init(NBIO,bio), /* 37: ioctl tunnel */
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 b55c85163a4..8f3f59a612a 100644
--- a/sys/arch/hppa64/hppa64/conf.c
+++ b/sys/arch/hppa64/hppa64/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.5 2007/05/27 01:50:36 todd Exp $ */
+/* $OpenBSD: conf.c,v 1.6 2007/05/28 22:26:03 todd Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -82,6 +82,7 @@ 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"
@@ -161,7 +162,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_notdef(), /* 37 */
+ cdev_bio_init(NBIO,bio), /* 37: ioctl tunnel */
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 7361bf5e266..7a7488dc145 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.559 2007/05/28 03:12:38 krw Exp $
+# $OpenBSD: GENERIC,v 1.560 2007/05/28 22:26:02 todd Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -717,7 +717,6 @@ 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 a7cfa2e6ceb..773e6da1746 100644
--- a/sys/arch/landisk/landisk/conf.c
+++ b/sys/arch/landisk/landisk/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.5 2007/05/27 01:50:36 todd Exp $ */
+/* $OpenBSD: conf.c,v 1.6 2007/05/28 22:26:03 todd Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -70,6 +70,7 @@
*/
#include "bpfilter.h"
#include "pf.h"
+#include "bio.h"
#include "pty.h"
#include "tun.h"
#include "ksyms.h"
@@ -317,7 +318,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_notdef(), /* 38: removed cpu device */
+ cdev_bio_init(NBIO,bio), /* 38: ioctl tunnel */
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 eff53fd5112..9101d501f43 100644
--- a/sys/arch/luna88k/luna88k/conf.c
+++ b/sys/arch/luna88k/luna88k/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.6 2007/05/27 01:50:36 todd Exp $ */
+/* $OpenBSD: conf.c,v 1.7 2007/05/28 22:26:03 todd Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -40,6 +40,7 @@
#include <machine/conf.h>
+#include "bio.h"
#include "pty.h"
#include "bpfilter.h"
#include "tun.h"
@@ -103,7 +104,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_notdef(), /* 7: */
+ 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 */
@@ -147,7 +148,7 @@ struct cdevsw cdevsw[] =
cdev_notdef(), /* 46 */
cdev_notdef(), /* 47 */
cdev_notdef(), /* 48 */
- cdev_notdef(), /* 49 */
+ cdev_bio_init(NBIO,bio), /* 49: ioctl tunnel */
cdev_systrace_init(NSYSTRACE,systrace), /* 50 system call tracing */
#ifdef XFS
cdev_xfs_init(NXFS,xfs_dev), /* 51: xfs communication device */
diff --git a/sys/arch/mac68k/mac68k/conf.c b/sys/arch/mac68k/mac68k/conf.c
index 98e563fd249..5b4f75bc933 100644
--- a/sys/arch/mac68k/mac68k/conf.c
+++ b/sys/arch/mac68k/mac68k/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.38 2007/05/27 01:50:36 todd Exp $ */
+/* $OpenBSD: conf.c,v 1.39 2007/05/28 22:26:03 todd Exp $ */
/* $NetBSD: conf.c,v 1.41 1997/02/11 07:35:49 scottr Exp $ */
/*
@@ -79,6 +79,7 @@ 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"
@@ -156,7 +157,7 @@ struct cdevsw cdevsw[] =
cdev_notdef(), /* 46 */
cdev_notdef(), /* 47 */
cdev_notdef(), /* 48 */
- cdev_notdef(), /* 49 */
+ cdev_bio_init(NBIO,bio), /* 49: ioctl tunnel */
cdev_systrace_init(NSYSTRACE,systrace), /* 50 system call tracing */
#ifdef XFS
cdev_xfs_init(NXFS,xfs_dev), /* 51: xfs communication device */
diff --git a/sys/arch/mvme68k/mvme68k/conf.c b/sys/arch/mvme68k/mvme68k/conf.c
index dd6653564ca..7f00e569bb0 100644
--- a/sys/arch/mvme68k/mvme68k/conf.c
+++ b/sys/arch/mvme68k/mvme68k/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.40 2007/05/27 01:50:36 todd Exp $ */
+/* $OpenBSD: conf.c,v 1.41 2007/05/28 22:26:03 todd Exp $ */
/*-
* Copyright (c) 1995 Theo de Raadt
@@ -111,6 +111,7 @@ int nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
#include "nvram.h"
#include "flash.h"
+#include "bio.h"
#include "pty.h"
cdev_decl(fd);
@@ -184,7 +185,7 @@ struct cdevsw cdevsw[] =
#else
cdev_notdef(), /* 26 */
#endif
- cdev_notdef(), /* 27 */
+ cdev_bio_init(NBIO,bio), /* 27: ioctl tunnel */
cdev_lp_init(NLP,lp), /* 28: lp */
cdev_lp_init(NLPTWO,lptwo), /* 29: lptwo */
cdev_tty_init(NWL,wl), /* 30: WG CL-CD2400 serial (ttywX) */
diff --git a/sys/arch/mvme88k/mvme88k/conf.c b/sys/arch/mvme88k/mvme88k/conf.c
index 4aac6ea9403..398593f6e36 100644
--- a/sys/arch/mvme88k/mvme88k/conf.c
+++ b/sys/arch/mvme88k/mvme88k/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.33 2007/05/27 01:50:36 todd Exp $ */
+/* $OpenBSD: conf.c,v 1.34 2007/05/28 22:26:03 todd Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -40,6 +40,7 @@
#include <machine/conf.h>
+#include "bio.h"
#include "pty.h"
#include "bpfilter.h"
#include "tun.h"
@@ -192,7 +193,7 @@ struct cdevsw cdevsw[] =
cdev_notdef(), /* 46 */
cdev_notdef(), /* 47 */
cdev_notdef(), /* 48 */
- cdev_notdef(), /* 49 */
+ cdev_bio_init(NBIO,bio), /* 49: ioctl tunnel */
cdev_systrace_init(NSYSTRACE,systrace), /* 50 system call tracing */
#ifdef XFS
cdev_xfs_init(NXFS,xfs_dev), /* 51: xfs communication device */
diff --git a/sys/arch/mvmeppc/mvmeppc/conf.c b/sys/arch/mvmeppc/mvmeppc/conf.c
index fffec58c04b..3965d05f5c2 100644
--- a/sys/arch/mvmeppc/mvmeppc/conf.c
+++ b/sys/arch/mvmeppc/mvmeppc/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.19 2007/05/27 01:50:36 todd Exp $ */
+/* $OpenBSD: conf.c,v 1.20 2007/05/28 22:26:03 todd Exp $ */
/*
* Copyright (c) 1997 Per Fogelstrom
@@ -84,6 +84,7 @@ struct bdevsw bdevsw[] = {
};
int nblkdev = sizeof bdevsw / sizeof bdevsw[0];
+#include "bio.h"
#include "pty.h"
#include "bugtty.h"
@@ -133,7 +134,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_notdef(), /* 12 */
+ cdev_notdef(), /* 12 */
cdev_notdef(), /* 13 */
cdev_tty_init(NBUGTTY,bugtty), /* 14: BUGtty (ttyB) */
cdev_notdef(), /* 15 */
@@ -178,7 +179,7 @@ struct cdevsw cdevsw[] = {
cdev_notdef(), /* 51 */
#endif
cdev_notdef(), /* 52 */
- cdev_notdef(), /* 53 */
+ cdev_bio_init(NBIO,bio), /* 53: ioctl tunnel */
cdev_disk_init(NRAID,raid), /* 54: RAIDframe disk driver */
cdev_ptm_init(NPTY,ptm), /* 55: pseudo-tty ptm device */
};
diff --git a/sys/arch/sgi/sgi/conf.c b/sys/arch/sgi/sgi/conf.c
index 907547ef2c0..55d74772150 100644
--- a/sys/arch/sgi/sgi/conf.c
+++ b/sys/arch/sgi/sgi/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.11 2007/05/27 01:50:36 todd Exp $ */
+/* $OpenBSD: conf.c,v 1.12 2007/05/28 22:26:03 todd Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -93,6 +93,7 @@ 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"
@@ -141,7 +142,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_notdef(), /* 14: */
+ cdev_notdef(), /* 14 */
cdev_notdef(), /* 15: */
cdev_lpt_init(NLPT,lpt), /* 16: Parallel printer interface */
cdev_tty_init(NCOM,com), /* 17: 16C450 serial interface */
@@ -180,7 +181,7 @@ cdev_wsdisplay_init(NWSDISPLAY, wsdisplay), /* 25: */
cdev_notdef(), /* 46: */
cdev_crypto_init(NCRYPTO,crypto), /* 47: /dev/crypto */
cdev_notdef(), /* 48: */
- cdev_notdef(), /* 49: */
+ cdev_bio_init(NDEV,bio), /* 49: ioctl tunnel */
cdev_systrace_init(NSYSTRACE,systrace), /* 50: system call tracing */
#ifdef XFS
cdev_xfs_init(NXFS,xfs_dev), /* 51: xfs communication device */
diff --git a/sys/arch/sparc/sparc/conf.c b/sys/arch/sparc/sparc/conf.c
index e3aba13edbf..7daac55f50b 100644
--- a/sys/arch/sparc/sparc/conf.c
+++ b/sys/arch/sparc/sparc/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.45 2007/05/27 01:50:36 todd Exp $ */
+/* $OpenBSD: conf.c,v 1.46 2007/05/28 22:26:03 todd Exp $ */
/* $NetBSD: conf.c,v 1.40 1996/04/11 19:20:03 thorpej Exp $ */
/*
@@ -51,6 +51,7 @@
#include <machine/conf.h>
+#include "bio.h"
#include "pty.h"
#include "bpfilter.h"
#include "tun.h"
@@ -263,7 +264,7 @@ struct cdevsw cdevsw[] =
cdev_ss_init(NSS,ss), /* 121: SCSI scanner */
cdev_ksyms_init(NKSYMS,ksyms), /* 122: Kernel symbols device */
cdev_disk_init(NRAID,raid), /* 123: RAIDframe disk driver */
- cdev_notdef(), /* 124 */
+ cdev_bio_init(NBIO,bio), /* 124: ioctl tunnel */
cdev_ptm_init(NPTY,ptm), /* 125: pseudo-tty ptm device */
};
int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);
diff --git a/sys/arch/sparc64/sparc64/conf.c b/sys/arch/sparc64/sparc64/conf.c
index d07c8a1e267..cb3d860b4f6 100644
--- a/sys/arch/sparc64/sparc64/conf.c
+++ b/sys/arch/sparc64/sparc64/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.43 2007/05/27 01:50:36 todd Exp $ */
+/* $OpenBSD: conf.c,v 1.44 2007/05/28 22:26:03 todd Exp $ */
/* $NetBSD: conf.c,v 1.17 2001/03/26 12:33:26 lukem Exp $ */
/*
@@ -51,6 +51,7 @@
#include <machine/conf.h>
+#include "bio.h"
#include "pty.h"
#include "bpfilter.h"
#include "tun.h"
@@ -276,7 +277,7 @@ struct cdevsw cdevsw[] =
cdev_lkm_dummy(), /* 117 */
cdev_lkm_dummy(), /* 118 */
cdev_random_init(1,random), /* 119: random data source */
- cdev_notdef(), /* 120 */
+ cdev_bio_init(NBIO,bio), /* 120: ioctl tunnel */
cdev_disk_init(NRAID,raid), /* 121: RAIDframe disk driver */
cdev_tty_init(NPCONS,pcons), /* 122: PROM console */
cdev_ptm_init(NPTY,ptm), /* 123: pseudo-tty ptm device */
diff --git a/sys/arch/vax/vax/conf.c b/sys/arch/vax/vax/conf.c
index b8da36d8e88..aab914b62b5 100644
--- a/sys/arch/vax/vax/conf.c
+++ b/sys/arch/vax/vax/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.51 2007/05/27 01:50:36 todd Exp $ */
+/* $OpenBSD: conf.c,v 1.52 2007/05/28 22:26:03 todd Exp $ */
/* $NetBSD: conf.c,v 1.44 1999/10/27 16:38:54 ragge Exp $ */
/*-
@@ -229,6 +229,7 @@ struct consdev constab[]={
#define mmread mmrw
#define mmwrite mmrw
cdev_decl(mm);
+#include "bio.h"
#include "pty.h"
cdev_decl(hp);
@@ -428,7 +429,7 @@ struct cdevsw cdevsw[] =
cdev_mouse_init(NWSKBD, wskbd), /* 69: keyboards */
cdev_mouse_init(NWSMOUSE, wsmouse), /* 70: mice */
cdev_disk_init(NRY,ry), /* 71: VS floppy */
- cdev_notdef(), /* 72: was: SCSI bus */
+ cdev_bio_init(NBIO,bio), /* 72: ioctl tunnel */
cdev_disk_init(NRAID,raid), /* 73: RAIDframe disk driver */
#ifdef XFS
cdev_xfs_init(NXFS,xfs_dev), /* 74: xfs communication device */
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC
index bfba2e39921..9ff0c24cd95 100644
--- a/sys/conf/GENERIC
+++ b/sys/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.130 2007/05/27 01:50:37 todd Exp $
+# $OpenBSD: GENERIC,v 1.131 2007/05/28 22:26:03 todd Exp $
#
# Machine-independent option; used by all architectures for their
# GENERIC kernel
@@ -103,5 +103,6 @@ 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 03:09:12 +0000