From: Matthew Dillon Date: Wed, 25 Aug 2010 18:58:29 +0000 (-0700) Subject: kernel - Remove D_KQFILTER flag X-Git-Tag: v2.9.0~398^2~3 X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/d4b8aec4bb44a374c3e91969c1a7df6569da7be3?ds=sidebyside kernel - Remove D_KQFILTER flag * The D_KQFILTER flag is no longer used. --- diff --git a/sys/bus/cam/scsi/scsi_target.c b/sys/bus/cam/scsi/scsi_target.c index 6156d461d3..eb8c2108df 100644 --- a/sys/bus/cam/scsi/scsi_target.c +++ b/sys/bus/cam/scsi/scsi_target.c @@ -111,7 +111,7 @@ static struct filterops targwrite_filtops = #define TARG_CDEV_MAJOR 65 static struct dev_ops targ_ops = { - { "targ", TARG_CDEV_MAJOR, D_KQFILTER }, + { "targ", TARG_CDEV_MAJOR, 0 }, .d_open = targopen, .d_close = targclose, .d_read = targread, diff --git a/sys/bus/firewire/fwdev.c b/sys/bus/firewire/fwdev.c index 3aace2a60f..9363c1a9b8 100644 --- a/sys/bus/firewire/fwdev.c +++ b/sys/bus/firewire/fwdev.c @@ -88,7 +88,7 @@ static int fwfilt_write(struct knote *, long); struct dev_ops firewire_ops = { - { "fw", CDEV_MAJOR, D_MEM | D_KQFILTER }, + { "fw", CDEV_MAJOR, D_MEM }, .d_open = fw_open, .d_close = fw_close, .d_read = fw_read, diff --git a/sys/bus/usb/usb.c b/sys/bus/usb/usb.c index fec9f72964..185375b79f 100644 --- a/sys/bus/usb/usb.c +++ b/sys/bus/usb/usb.c @@ -152,7 +152,7 @@ static void usbfilt_detach(struct knote *); static int usbfilt(struct knote *, long); struct dev_ops usb_ops = { - { "usb", USB_CDEV_MAJOR, D_KQFILTER }, + { "usb", USB_CDEV_MAJOR, 0 }, .d_open = usbopen, .d_close = usbclose, .d_read = usbread, diff --git a/sys/dev/drm/drm_drv.c b/sys/dev/drm/drm_drv.c index b05f1ce74f..e407084add 100644 --- a/sys/dev/drm/drm_drv.c +++ b/sys/dev/drm/drm_drv.c @@ -119,7 +119,7 @@ static drm_ioctl_desc_t drm_ioctls[256] = { }; static struct dev_ops drm_cdevsw = { - { "drm", 145, D_TRACKCLOSE | D_KQFILTER }, + { "drm", 145, D_TRACKCLOSE }, .d_open = drm_open, .d_close = drm_close, .d_read = drm_read, diff --git a/sys/dev/misc/cmx/cmx.c b/sys/dev/misc/cmx/cmx.c index bf19362762..0d5c9fd037 100644 --- a/sys/dev/misc/cmx/cmx.c +++ b/sys/dev/misc/cmx/cmx.c @@ -140,7 +140,7 @@ static int cmx_filter_write(struct knote *, long); #define CDEV_MAJOR 185 static struct dev_ops cmx_ops = { - { "cmx", CDEV_MAJOR, D_KQFILTER }, + { "cmx", CDEV_MAJOR, 0 }, .d_open = cmx_open, .d_close = cmx_close, .d_read = cmx_read, diff --git a/sys/dev/misc/dcons/dcons_os.c b/sys/dev/misc/dcons/dcons_os.c index 194902fa9c..37c9f73bc6 100644 --- a/sys/dev/misc/dcons/dcons_os.c +++ b/sys/dev/misc/dcons/dcons_os.c @@ -94,7 +94,7 @@ static d_close_t dcons_close; static d_ioctl_t dcons_ioctl; static struct dev_ops dcons_ops = { - { "dcons", CDEV_MAJOR, D_TTY | D_KQFILTER }, + { "dcons", CDEV_MAJOR, D_TTY }, .d_open = dcons_open, .d_close = dcons_close, .d_read = ttyread, diff --git a/sys/dev/misc/hotplug/hotplug.c b/sys/dev/misc/hotplug/hotplug.c index 5bda728862..fae5d79d2c 100644 --- a/sys/dev/misc/hotplug/hotplug.c +++ b/sys/dev/misc/hotplug/hotplug.c @@ -46,7 +46,7 @@ static void hotplugfiltdetach(struct knote *); static int hotplugfilt(struct knote *, long); static struct dev_ops hotplug_ops = { - { "hotplug", CDEV_MAJOR, D_KQFILTER }, + { "hotplug", CDEV_MAJOR, 0 }, .d_open = hotplugopen, .d_close = hotplugclose, .d_read = hotplugread, diff --git a/sys/dev/misc/kbd/kbd.c b/sys/dev/misc/kbd/kbd.c index bf940e6267..b7cee66eac 100644 --- a/sys/dev/misc/kbd/kbd.c +++ b/sys/dev/misc/kbd/kbd.c @@ -502,7 +502,7 @@ static int genkbdfilter(struct knote *, long); #define CDEV_MAJOR 112 static struct dev_ops kbd_ops = { - { "kbd", CDEV_MAJOR, D_KQFILTER }, + { "kbd", CDEV_MAJOR, 0 }, .d_open = genkbdopen, .d_close = genkbdclose, .d_read = genkbdread, diff --git a/sys/dev/misc/nmdm/nmdm.c b/sys/dev/misc/nmdm/nmdm.c index 5774269cfe..075c96b06a 100644 --- a/sys/dev/misc/nmdm/nmdm.c +++ b/sys/dev/misc/nmdm/nmdm.c @@ -69,7 +69,7 @@ static d_ioctl_t nmdmioctl; #define CDEV_MAJOR 18 static struct dev_ops nmdm_ops = { - { "pts", CDEV_MAJOR, D_TTY | D_KQFILTER }, + { "pts", CDEV_MAJOR, D_TTY }, .d_open = nmdmopen, .d_close = nmdmclose, .d_read = nmdmread, diff --git a/sys/dev/misc/psm/psm.c b/sys/dev/misc/psm/psm.c index 6af8d4ee11..4a6ede11c3 100644 --- a/sys/dev/misc/psm/psm.c +++ b/sys/dev/misc/psm/psm.c @@ -343,7 +343,7 @@ static struct isa_pnp_id psm_ids[] = { #define CDEV_MAJOR 21 static struct dev_ops psm_ops = { - { PSM_DRIVER_NAME, CDEV_MAJOR, D_KQFILTER }, + { PSM_DRIVER_NAME, CDEV_MAJOR, 0 }, .d_open = psmopen, .d_close = psmclose, .d_read = psmread, diff --git a/sys/dev/misc/snp/snp.c b/sys/dev/misc/snp/snp.c index ffd425da90..2dd93fa71f 100644 --- a/sys/dev/misc/snp/snp.c +++ b/sys/dev/misc/snp/snp.c @@ -55,7 +55,7 @@ static int snpfilter_wr(struct knote *, long); #define CDEV_MAJOR 53 static struct dev_ops snp_ops = { - { "snp", CDEV_MAJOR, D_KQFILTER }, + { "snp", CDEV_MAJOR, 0 }, .d_open = snpopen, .d_close = snpclose, .d_read = snpread, diff --git a/sys/dev/misc/spic/spic.c b/sys/dev/misc/spic/spic.c index 336ebe74d4..dba3b9c870 100644 --- a/sys/dev/misc/spic/spic.c +++ b/sys/dev/misc/spic/spic.c @@ -91,7 +91,7 @@ static void spicfilt_detach(struct knote *); static int spicfilt(struct knote *, long); static struct dev_ops spic_ops = { - { "spic", CDEV_MAJOR, D_KQFILTER }, + { "spic", CDEV_MAJOR, 0 }, .d_open = spicopen, .d_close = spicclose, .d_read = spicread, diff --git a/sys/dev/misc/syscons/syscons.c b/sys/dev/misc/syscons/syscons.c index 3f2b330c47..1a10cea362 100644 --- a/sys/dev/misc/syscons/syscons.c +++ b/sys/dev/misc/syscons/syscons.c @@ -234,7 +234,7 @@ static d_ioctl_t scioctl; static d_mmap_t scmmap; static struct dev_ops sc_ops = { - { "sc", CDEV_MAJOR, D_TTY | D_KQFILTER }, + { "sc", CDEV_MAJOR, D_TTY }, .d_open = scopen, .d_close = scclose, .d_read = scread, diff --git a/sys/dev/misc/syscons/sysmouse.c b/sys/dev/misc/syscons/sysmouse.c index 954f7f11b5..1b1cda7692 100644 --- a/sys/dev/misc/syscons/sysmouse.c +++ b/sys/dev/misc/syscons/sysmouse.c @@ -53,7 +53,7 @@ static d_close_t smclose; static d_ioctl_t smioctl; static struct dev_ops sm_ops = { - { "sysmouse", CDEV_MAJOR, D_TTY | D_KQFILTER }, + { "sysmouse", CDEV_MAJOR, D_TTY }, .d_open = smopen, .d_close = smclose, .d_read = ttyread, diff --git a/sys/dev/raid/aac/aac.c b/sys/dev/raid/aac/aac.c index f8a850f369..b8205d82fc 100644 --- a/sys/dev/raid/aac/aac.c +++ b/sys/dev/raid/aac/aac.c @@ -229,7 +229,7 @@ static void aac_ioctl_event(struct aac_softc *sc, #define AAC_CDEV_MAJOR 150 static struct dev_ops aac_ops = { - { "aac", AAC_CDEV_MAJOR, D_KQFILTER }, + { "aac", AAC_CDEV_MAJOR, 0 }, .d_open = aac_open, .d_close = aac_close, .d_ioctl = aac_ioctl, diff --git a/sys/dev/raid/vinum/vinum.c b/sys/dev/raid/vinum/vinum.c index 20cfdeb793..317f854f59 100644 --- a/sys/dev/raid/vinum/vinum.c +++ b/sys/dev/raid/vinum/vinum.c @@ -59,7 +59,7 @@ extern struct mc malloced[]; struct dev_ops vinum_ops = { - { "vinum", VINUM_CDEV_MAJOR, D_DISK | D_KQFILTER }, + { "vinum", VINUM_CDEV_MAJOR, D_DISK }, .d_open = vinumopen, .d_close = vinumclose, .d_read = physread, diff --git a/sys/dev/serial/cy/cy.c b/sys/dev/serial/cy/cy.c index 218ee5f0ea..550da5e57e 100644 --- a/sys/dev/serial/cy/cy.c +++ b/sys/dev/serial/cy/cy.c @@ -384,7 +384,7 @@ static d_ioctl_t sioioctl; #define CDEV_MAJOR 48 static struct dev_ops sio_ops = { - { driver_name, CDEV_MAJOR, D_TTY | D_KQFILTER }, + { driver_name, CDEV_MAJOR, D_TTY }, .d_open = sioopen, .d_close = sioclose, .d_read = ttyread, diff --git a/sys/dev/serial/dgb/dgm.c b/sys/dev/serial/dgb/dgm.c index 38cea81ce3..88912c24c7 100644 --- a/sys/dev/serial/dgb/dgm.c +++ b/sys/dev/serial/dgb/dgm.c @@ -242,7 +242,7 @@ static devclass_t dgmdevclass; #define CDEV_MAJOR 101 static struct dev_ops dgm_ops = { - { "dgm", CDEV_MAJOR, D_TTY | D_KQFILTER }, + { "dgm", CDEV_MAJOR, D_TTY }, .d_open = dgmopen, .d_close = dgmclose, .d_read = ttyread, diff --git a/sys/dev/serial/rc/rc.c b/sys/dev/serial/rc/rc.c index 58e452fb23..0e2cfe14f7 100644 --- a/sys/dev/serial/rc/rc.c +++ b/sys/dev/serial/rc/rc.c @@ -92,7 +92,7 @@ static d_ioctl_t rcioctl; #define CDEV_MAJOR 63 static struct dev_ops rc_ops = { - { "rc", CDEV_MAJOR, D_TTY | D_KQFILTER }, + { "rc", CDEV_MAJOR, D_TTY }, .d_open = rcopen, .d_close = rcclose, .d_read = ttyread, diff --git a/sys/dev/serial/rp/rp.c b/sys/dev/serial/rp/rp.c index f095f9ef54..d5f9f9d7a9 100644 --- a/sys/dev/serial/rp/rp.c +++ b/sys/dev/serial/rp/rp.c @@ -572,7 +572,7 @@ static d_ioctl_t rpioctl; #define CDEV_MAJOR 81 struct dev_ops rp_ops = { - { "rp", CDEV_MAJOR, D_TTY | D_KQFILTER }, + { "rp", CDEV_MAJOR, D_TTY }, .d_open = rpopen, .d_close = rpclose, .d_read = ttyread, diff --git a/sys/dev/serial/si/si.c b/sys/dev/serial/si/si.c index 5daec9d9eb..c55096c925 100644 --- a/sys/dev/serial/si/si.c +++ b/sys/dev/serial/si/si.c @@ -120,7 +120,7 @@ static d_ioctl_t siioctl; #define CDEV_MAJOR 68 static struct dev_ops si_ops = { - { "si", CDEV_MAJOR, D_TTY | D_KQFILTER }, + { "si", CDEV_MAJOR, D_TTY }, .d_open = siopen, .d_close = siclose, .d_read = ttyread, diff --git a/sys/dev/serial/sio/sio.c b/sys/dev/serial/sio/sio.c index 4865894b14..d58860cc7d 100644 --- a/sys/dev/serial/sio/sio.c +++ b/sys/dev/serial/sio/sio.c @@ -251,7 +251,7 @@ static d_ioctl_t sioioctl; #define CDEV_MAJOR 28 static struct dev_ops sio_ops = { - { driver_name, CDEV_MAJOR, D_TTY | D_KQFILTER }, + { driver_name, CDEV_MAJOR, D_TTY }, .d_open = sioopen, .d_close = sioclose, .d_read = sioread, diff --git a/sys/dev/serial/stl/stallion.c b/sys/dev/serial/stl/stallion.c index b6e618315d..0c27445430 100644 --- a/sys/dev/serial/stl/stallion.c +++ b/sys/dev/serial/stl/stallion.c @@ -750,7 +750,7 @@ COMPAT_PCI_DRIVER (stlpci, stlpcidriver); #define CDEV_MAJOR 72 static struct dev_ops stl_ops = { - { "stl", CDEV_MAJOR, D_TTY | D_KQFILTER }, + { "stl", CDEV_MAJOR, D_TTY }, .d_open = stlopen, .d_close = stlclose, .d_read = ttyread, diff --git a/sys/dev/serial/stli/istallion.c b/sys/dev/serial/stli/istallion.c index 1557ec4324..da88508700 100644 --- a/sys/dev/serial/stli/istallion.c +++ b/sys/dev/serial/stli/istallion.c @@ -633,7 +633,7 @@ struct isa_driver stlidriver = { #define CDEV_MAJOR 75 static struct dev_ops stli_ops = { - { stli_drvname, CDEV_MAJOR, D_TTY | D_KQFILTER }, + { stli_drvname, CDEV_MAJOR, D_TTY }, .d_open = stliopen, .d_close = stliclose, .d_read = stliread, diff --git a/sys/dev/usbmisc/ucom/ucom.c b/sys/dev/usbmisc/ucom/ucom.c index d3644d296e..bcffabfde4 100644 --- a/sys/dev/usbmisc/ucom/ucom.c +++ b/sys/dev/usbmisc/ucom/ucom.c @@ -119,7 +119,7 @@ static d_ioctl_t ucomioctl; #define UCOM_CDEV_MAJOR 138 static struct dev_ops ucom_ops = { - { "ucom", UCOM_CDEV_MAJOR, D_TTY | D_KQFILTER }, + { "ucom", UCOM_CDEV_MAJOR, D_TTY }, .d_open = ucomopen, .d_close = ucomclose, .d_read = ucomread, diff --git a/sys/dev/usbmisc/ugen/ugen.c b/sys/dev/usbmisc/ugen/ugen.c index 425dd1e413..3922b58685 100644 --- a/sys/dev/usbmisc/ugen/ugen.c +++ b/sys/dev/usbmisc/ugen/ugen.c @@ -147,7 +147,7 @@ static int ugen_filt_write(struct knote *, long); #define UGEN_CDEV_MAJOR 114 static struct dev_ops ugen_ops = { - { "ugen", UGEN_CDEV_MAJOR, D_KQFILTER }, + { "ugen", UGEN_CDEV_MAJOR, 0 }, .d_open = ugenopen, .d_close = ugenclose, .d_read = ugenread, diff --git a/sys/dev/usbmisc/uhid/uhid.c b/sys/dev/usbmisc/uhid/uhid.c index bd9693acfb..011decf650 100644 --- a/sys/dev/usbmisc/uhid/uhid.c +++ b/sys/dev/usbmisc/uhid/uhid.c @@ -139,7 +139,7 @@ static int uhidfilt_write(struct knote *, long); #define UHID_CDEV_MAJOR 122 static struct dev_ops uhid_ops = { - { "uhid", UHID_CDEV_MAJOR, D_KQFILTER }, + { "uhid", UHID_CDEV_MAJOR, 0 }, .d_open = uhidopen, .d_close = uhidclose, .d_read = uhidread, diff --git a/sys/dev/usbmisc/ums/ums.c b/sys/dev/usbmisc/ums/ums.c index bfec24d04a..ee2f775d44 100644 --- a/sys/dev/usbmisc/ums/ums.c +++ b/sys/dev/usbmisc/ums/ums.c @@ -146,7 +146,7 @@ static int ums_filt(struct knote *, long); #define UMS_CDEV_MAJOR 111 static struct dev_ops ums_ops = { - { "ums", UMS_CDEV_MAJOR, D_KQFILTER }, + { "ums", UMS_CDEV_MAJOR, 0 }, .d_open = ums_open, .d_close = ums_close, .d_read = ums_read, diff --git a/sys/dev/usbmisc/uscanner/uscanner.c b/sys/dev/usbmisc/uscanner/uscanner.c index 2981b126f3..87cf777850 100644 --- a/sys/dev/usbmisc/uscanner/uscanner.c +++ b/sys/dev/usbmisc/uscanner/uscanner.c @@ -259,7 +259,7 @@ d_kqfilter_t uscannerkqfilter; #define USCANNER_CDEV_MAJOR 156 static struct dev_ops uscanner_ops = { - { "uscanner", USCANNER_CDEV_MAJOR, D_KQFILTER }, + { "uscanner", USCANNER_CDEV_MAJOR, 0 }, .d_open = uscanneropen, .d_close = uscannerclose, .d_read = uscannerread, diff --git a/sys/dev/video/cxm/cxm.c b/sys/dev/video/cxm/cxm.c index a66e756bff..e2064e64e4 100644 --- a/sys/dev/video/cxm/cxm.c +++ b/sys/dev/video/cxm/cxm.c @@ -128,7 +128,7 @@ static int cxm_filter(struct knote *, long); #define CDEV_MAJOR 93 static struct dev_ops cxm_ops = { - { "cxm", CDEV_MAJOR, D_KQFILTER }, + { "cxm", CDEV_MAJOR, 0 }, .d_open = cxm_open, .d_close = cxm_close, .d_read = cxm_read, diff --git a/sys/kern/kern_udev.c b/sys/kern/kern_udev.c index 8b918f1b81..f79b0dadaa 100644 --- a/sys/kern/kern_udev.c +++ b/sys/kern/kern_udev.c @@ -102,7 +102,7 @@ struct udev_softc { } udevctx; static struct dev_ops udev_dev_ops = { - { "udev", 0, D_KQFILTER }, + { "udev", 0, 0 }, .d_open = udev_dev_open, .d_close = udev_dev_close, .d_read = udev_dev_read, diff --git a/sys/kern/subr_log.c b/sys/kern/subr_log.c index 6926e44f2d..b98b2b9b32 100644 --- a/sys/kern/subr_log.c +++ b/sys/kern/subr_log.c @@ -70,7 +70,7 @@ static int logfiltread(struct knote *kn, long hint); #define CDEV_MAJOR 7 static struct dev_ops log_ops = { - { "log", CDEV_MAJOR, D_KQFILTER }, + { "log", CDEV_MAJOR, 0 }, .d_open = logopen, .d_close = logclose, .d_read = logread, diff --git a/sys/kern/tty_cons.c b/sys/kern/tty_cons.c index 3c6c4dd5eb..d1cd5e4c86 100644 --- a/sys/kern/tty_cons.c +++ b/sys/kern/tty_cons.c @@ -72,7 +72,7 @@ static int cnintercept(struct dev_generic_args *ap); #define CDEV_MAJOR 0 static struct dev_ops cn_ops = { - { "console", CDEV_MAJOR, D_TTY | D_KQFILTER }, + { "console", CDEV_MAJOR, D_TTY }, .d_open = cnopen, .d_close = cnclose, .d_read = cnread, @@ -82,7 +82,7 @@ static struct dev_ops cn_ops = { }; static struct dev_ops cn_iops = { - { "intercept", CDEV_MAJOR, D_TTY | D_KQFILTER }, + { "intercept", CDEV_MAJOR, D_TTY }, .d_default = cnintercept }; diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c index 163dfc376b..7dbd218fa8 100644 --- a/sys/kern/tty_pty.c +++ b/sys/kern/tty_pty.c @@ -94,7 +94,7 @@ static d_clone_t ptyclone; static int pty_debug_level = 0; static struct dev_ops pts98_ops = { - { "pts98", 0, D_TTY | D_KQFILTER }, + { "pts98", 0, D_TTY }, .d_open = ptsopen, .d_close = ptsclose, .d_read = ptsread, @@ -105,7 +105,7 @@ static struct dev_ops pts98_ops = { }; static struct dev_ops ptc98_ops = { - { "ptc98", 0, D_TTY | D_KQFILTER | D_MASTER }, + { "ptc98", 0, D_TTY | D_MASTER }, .d_open = ptcopen, .d_close = ptcclose, .d_read = ptcread, @@ -118,7 +118,7 @@ static struct dev_ops ptc98_ops = { #define CDEV_MAJOR_S 5 static struct dev_ops pts_ops = { - { "pts", CDEV_MAJOR_S, D_TTY | D_KQFILTER }, + { "pts", CDEV_MAJOR_S, D_TTY }, .d_open = ptsopen, .d_close = ptsclose, .d_read = ptsread, @@ -130,7 +130,7 @@ static struct dev_ops pts_ops = { #define CDEV_MAJOR_C 6 static struct dev_ops ptc_ops = { - { "ptc", CDEV_MAJOR_C, D_TTY | D_KQFILTER | D_MASTER }, + { "ptc", CDEV_MAJOR_C, D_TTY | D_MASTER }, .d_open = ptcopen, .d_close = ptcclose, .d_read = ptcread, diff --git a/sys/kern/tty_tty.c b/sys/kern/tty_tty.c index edfe21c5c3..f0976b9e82 100644 --- a/sys/kern/tty_tty.c +++ b/sys/kern/tty_tty.c @@ -66,7 +66,7 @@ static int cttyfilt_write(struct knote *, long); #define CDEV_MAJOR 1 /* Don't make this static, since fdesc_vnops uses it. */ struct dev_ops ctty_ops = { - { "ctty", CDEV_MAJOR, D_TTY | D_KQFILTER }, + { "ctty", CDEV_MAJOR, D_TTY }, .d_open = cttyopen, .d_close = cttyclose, .d_read = cttyread, diff --git a/sys/net/bpf.c b/sys/net/bpf.c index 0e3234e50c..afc885ec95 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -141,7 +141,7 @@ static d_kqfilter_t bpfkqfilter; #define CDEV_MAJOR 23 static struct dev_ops bpf_ops = { - { "bpf", CDEV_MAJOR, D_KQFILTER }, + { "bpf", CDEV_MAJOR, 0 }, .d_open = bpfopen, .d_close = bpfclose, .d_read = bpfread, diff --git a/sys/net/i4b/driver/i4b_rbch.c b/sys/net/i4b/driver/i4b_rbch.c index c9373d9054..c4ec9cf908 100644 --- a/sys/net/i4b/driver/i4b_rbch.c +++ b/sys/net/i4b/driver/i4b_rbch.c @@ -127,7 +127,7 @@ PDEVSTATIC int i4brbchkfilt_write(struct knote *, long); #define CDEV_MAJOR 57 static struct dev_ops i4brbch_ops = { - { "i4brbch", CDEV_MAJOR, D_KQFILTER }, + { "i4brbch", CDEV_MAJOR, 0 }, .d_open = i4brbchopen, .d_close = i4brbchclose, .d_read = i4brbchread, diff --git a/sys/net/i4b/driver/i4b_tel.c b/sys/net/i4b/driver/i4b_tel.c index eff20d3fef..2b1638d0b1 100644 --- a/sys/net/i4b/driver/i4b_tel.c +++ b/sys/net/i4b/driver/i4b_tel.c @@ -150,7 +150,7 @@ PDEVSTATIC int i4btelfilt_write(struct knote *, long); #define CDEV_MAJOR 56 static struct dev_ops i4btel_ops = { - { "i4btel", CDEV_MAJOR, D_KQFILTER }, + { "i4btel", CDEV_MAJOR, 0 }, .d_open = i4btelopen, .d_close = i4btelclose, .d_read = i4btelread, diff --git a/sys/net/i4b/layer4/i4b_i4bdrv.c b/sys/net/i4b/layer4/i4b_i4bdrv.c index 2b22d64721..689140cba8 100644 --- a/sys/net/i4b/layer4/i4b_i4bdrv.c +++ b/sys/net/i4b/layer4/i4b_i4bdrv.c @@ -94,7 +94,7 @@ PDEVSTATIC int i4bkqfilt_write(struct knote *, long); #define CDEV_MAJOR 60 static struct dev_ops i4b_ops = { - { "i4b", CDEV_MAJOR, D_KQFILTER }, + { "i4b", CDEV_MAJOR, 0 }, .d_open = i4bopen, .d_close = i4bclose, .d_read = i4bread, diff --git a/sys/net/tun/if_tun.c b/sys/net/tun/if_tun.c index 59e781266f..6d20a0519a 100644 --- a/sys/net/tun/if_tun.c +++ b/sys/net/tun/if_tun.c @@ -99,7 +99,7 @@ DEVFS_DECLARE_CLONE_BITMAP(tun); #define CDEV_MAJOR 52 static struct dev_ops tun_ops = { - { "tun", CDEV_MAJOR, D_KQFILTER }, + { "tun", CDEV_MAJOR, 0 }, .d_open = tunopen, .d_close = tunclose, .d_read = tunread, diff --git a/sys/platform/pc32/acpica5/acpi_machdep.c b/sys/platform/pc32/acpica5/acpi_machdep.c index bf2ef13c21..6985f1d32e 100644 --- a/sys/platform/pc32/acpica5/acpi_machdep.c +++ b/sys/platform/pc32/acpica5/acpi_machdep.c @@ -70,7 +70,7 @@ static d_kqfilter_t apmkqfilter; #define CDEV_MAJOR 39 static struct dev_ops apm_ops = { - { "apm", CDEV_MAJOR, D_KQFILTER }, + { "apm", CDEV_MAJOR, 0 }, .d_open = apmopen, .d_close = apmclose, .d_write = apmwrite, diff --git a/sys/platform/pc32/apm/apm.c b/sys/platform/pc32/apm/apm.c index 699852f0d4..e4d942149a 100644 --- a/sys/platform/pc32/apm/apm.c +++ b/sys/platform/pc32/apm/apm.c @@ -89,7 +89,7 @@ static int apmfilter_write(struct knote *, long); #define CDEV_MAJOR 39 static struct dev_ops apm_ops = { - { "apm", CDEV_MAJOR, D_KQFILTER }, + { "apm", CDEV_MAJOR, 0 }, .d_open = apmopen, .d_close = apmclose, .d_write = apmwrite, diff --git a/sys/platform/pc32/gnu/isa/dgb.c b/sys/platform/pc32/gnu/isa/dgb.c index 9c329d25ef..18a704ebe1 100644 --- a/sys/platform/pc32/gnu/isa/dgb.c +++ b/sys/platform/pc32/gnu/isa/dgb.c @@ -218,7 +218,7 @@ static d_ioctl_t dgbioctl; static struct cdevsw dgb_cdevsw = { /* name */ "dgb", /* maj */ CDEV_MAJOR, - /* flags */ D_TTY | D_KQFILTER, + /* flags */ D_TTY, /* port */ NULL, /* clone */ NULL, diff --git a/sys/platform/pc32/isa/asc.c b/sys/platform/pc32/isa/asc.c index 2ff96f15e4..f64614b494 100644 --- a/sys/platform/pc32/isa/asc.c +++ b/sys/platform/pc32/isa/asc.c @@ -192,7 +192,7 @@ static int ascfilter(struct knote *kn, long hint); #define CDEV_MAJOR 71 static struct dev_ops asc_ops = { - { "asc", CDEV_MAJOR, D_KQFILTER }, + { "asc", CDEV_MAJOR, 0 }, .d_open = ascopen, .d_close = ascclose, .d_read = ascread, diff --git a/sys/platform/pc64/apm/apm.c b/sys/platform/pc64/apm/apm.c index d636cccbc9..5d2e622ccd 100644 --- a/sys/platform/pc64/apm/apm.c +++ b/sys/platform/pc64/apm/apm.c @@ -89,7 +89,7 @@ static int apmfilter_write(struct knote *, long); #define CDEV_MAJOR 39 static struct dev_ops apm_ops = { - { "apm", CDEV_MAJOR, D_KQFILTER }, + { "apm", CDEV_MAJOR, 0 }, .d_open = apmopen, .d_close = apmclose, .d_write = apmwrite, diff --git a/sys/platform/pc64/isa/asc.c b/sys/platform/pc64/isa/asc.c index fac7ad8d58..d36c34eb38 100644 --- a/sys/platform/pc64/isa/asc.c +++ b/sys/platform/pc64/isa/asc.c @@ -191,7 +191,7 @@ static int ascfilter(struct knote *kn, long hint); #define CDEV_MAJOR 71 static struct dev_ops asc_ops = { - { "asc", CDEV_MAJOR, D_KQFILTER }, + { "asc", CDEV_MAJOR, 0 }, .d_open = ascopen, .d_close = ascclose, .d_read = ascread, diff --git a/sys/platform/vkernel/platform/console.c b/sys/platform/vkernel/platform/console.c index 54de5a96b4..632f4d2497 100644 --- a/sys/platform/vkernel/platform/console.c +++ b/sys/platform/vkernel/platform/console.c @@ -82,7 +82,7 @@ static d_close_t vcons_close; static d_ioctl_t vcons_ioctl; static struct dev_ops vcons_ops = { - { "vcons", CDEV_MAJOR, D_TTY | D_KQFILTER }, + { "vcons", CDEV_MAJOR, D_TTY }, .d_open = vcons_open, .d_close = vcons_close, .d_read = ttyread, diff --git a/sys/platform/vkernel64/platform/console.c b/sys/platform/vkernel64/platform/console.c index 353bd51188..8e0abc1135 100644 --- a/sys/platform/vkernel64/platform/console.c +++ b/sys/platform/vkernel64/platform/console.c @@ -82,7 +82,7 @@ static d_close_t vcons_close; static d_ioctl_t vcons_ioctl; static struct dev_ops vcons_ops = { - { "vcons", CDEV_MAJOR, D_TTY | D_KQFILTER }, + { "vcons", CDEV_MAJOR, D_TTY }, .d_open = vcons_open, .d_close = vcons_close, .d_read = ttyread, diff --git a/sys/sys/device.h b/sys/sys/device.h index cba47744dd..45f4a2fc64 100644 --- a/sys/sys/device.h +++ b/sys/sys/device.h @@ -249,7 +249,7 @@ struct dev_ops { #define D_CANFREE 0x00040000 /* can free blocks */ #define D_TRACKCLOSE 0x00080000 /* track all closes */ #define D_MASTER 0x00100000 /* used by pty/tty code */ -#define D_KQFILTER 0x00200000 /* has kqfilter entry */ +#define D_UNUSED200000 0x00200000 #define D_MPSAFE 0x00400000 /* all dev_d*() calls are MPSAFE */ /*