summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/amd64/include/conf.h4
-rw-r--r--sys/arch/arm/include/conf.h4
-rw-r--r--sys/arch/i386/include/conf.h4
-rw-r--r--sys/arch/landisk/include/conf.h4
-rw-r--r--sys/arch/loongson/include/conf.h4
-rw-r--r--sys/arch/macppc/include/conf.h4
-rw-r--r--sys/arch/sparc/include/conf.h4
-rw-r--r--sys/dev/cons.c4
-rw-r--r--sys/kern/spec_vnops.c4
-rw-r--r--sys/miscfs/specfs/spec_vnops.c4
-rw-r--r--sys/sys/conf.h49
11 files changed, 44 insertions, 45 deletions
diff --git a/sys/arch/amd64/include/conf.h b/sys/arch/amd64/include/conf.h
index 739e4f06ea1..7b1357abf6e 100644
--- a/sys/arch/amd64/include/conf.h
+++ b/sys/arch/amd64/include/conf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.h,v 1.5 2010/07/21 15:40:04 deraadt Exp $ */
+/* $OpenBSD: conf.h,v 1.6 2011/07/04 16:52:41 nicm Exp $ */
/* $NetBSD: conf.h,v 1.2 1996/05/05 19:28:34 christos Exp $ */
/*
@@ -48,7 +48,7 @@ cdev_decl(bios);
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
(dev_type_stop((*))) enodev, 0, selfalse, \
- (dev_type_mmap((*))) enodev, 0, D_KQFILTER, dev_init(c,n,kqfilter) }
+ (dev_type_mmap((*))) enodev, 0, 0, dev_init(c,n,kqfilter) }
cdev_decl(acpi);
#define pctrpoll seltrue
diff --git a/sys/arch/arm/include/conf.h b/sys/arch/arm/include/conf.h
index 9fe2f2d3c52..a0f49a5e616 100644
--- a/sys/arch/arm/include/conf.h
+++ b/sys/arch/arm/include/conf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.h,v 1.9 2011/03/23 16:54:34 pirofti Exp $ */
+/* $OpenBSD: conf.h,v 1.10 2011/07/04 16:52:41 nicm Exp $ */
/* $NetBSD: conf.h,v 1.7 2002/04/19 01:04:39 wiz Exp $ */
/*
@@ -62,7 +62,7 @@ cdev_decl(fd);
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
(dev_type_stop((*))) enodev, 0, selfalse, \
- (dev_type_mmap((*))) enodev, 0, D_KQFILTER, dev_init(c,n,kqfilter) }
+ (dev_type_mmap((*))) enodev, 0, 0, dev_init(c,n,kqfilter) }
cdev_decl(com);
cdev_decl(lpt);
diff --git a/sys/arch/i386/include/conf.h b/sys/arch/i386/include/conf.h
index 4de0d70ac7e..2518cb550e4 100644
--- a/sys/arch/i386/include/conf.h
+++ b/sys/arch/i386/include/conf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.h,v 1.14 2010/07/21 15:40:04 deraadt Exp $ */
+/* $OpenBSD: conf.h,v 1.15 2011/07/04 16:52:41 nicm Exp $ */
/* $NetBSD: conf.h,v 1.2 1996/05/05 19:28:34 christos Exp $ */
/*
@@ -53,7 +53,7 @@ cdev_decl(pc);
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
(dev_type_stop((*))) enodev, 0, selfalse, \
- (dev_type_mmap((*))) enodev, 0, D_KQFILTER, dev_init(c,n,kqfilter) }
+ (dev_type_mmap((*))) enodev, 0, 0, dev_init(c,n,kqfilter) }
cdev_decl(spkr);
diff --git a/sys/arch/landisk/include/conf.h b/sys/arch/landisk/include/conf.h
index 53a9522d8c0..6771f00695a 100644
--- a/sys/arch/landisk/include/conf.h
+++ b/sys/arch/landisk/include/conf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.h,v 1.5 2011/03/23 16:54:35 pirofti Exp $ */
+/* $OpenBSD: conf.h,v 1.6 2011/07/04 16:52:41 nicm Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe.
@@ -64,7 +64,7 @@ cdev_decl(fd);
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
(dev_type_stop((*))) enodev, 0, selfalse, \
- (dev_type_mmap((*))) enodev, 0, D_KQFILTER, dev_init(c,n,kqfilter) }
+ (dev_type_mmap((*))) enodev, 0, 0, dev_init(c,n,kqfilter) }
cdev_decl(com);
cdev_decl(rtc);
diff --git a/sys/arch/loongson/include/conf.h b/sys/arch/loongson/include/conf.h
index 144d04d1253..d61820fdedd 100644
--- a/sys/arch/loongson/include/conf.h
+++ b/sys/arch/loongson/include/conf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.h,v 1.2 2010/07/21 15:40:04 deraadt Exp $ */
+/* $OpenBSD: conf.h,v 1.3 2011/07/04 16:52:41 nicm Exp $ */
/* $NetBSD: conf.h,v 1.2 1996/05/05 19:28:34 christos Exp $ */
/*
@@ -37,6 +37,6 @@
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
(dev_type_stop((*))) enodev, 0, selfalse, \
- (dev_type_mmap((*))) enodev, 0, D_KQFILTER, dev_init(c,n,kqfilter) }
+ (dev_type_mmap((*))) enodev, 0, 0, dev_init(c,n,kqfilter) }
cdev_decl(apm);
diff --git a/sys/arch/macppc/include/conf.h b/sys/arch/macppc/include/conf.h
index ed478344e40..8f071cdd8fd 100644
--- a/sys/arch/macppc/include/conf.h
+++ b/sys/arch/macppc/include/conf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.h,v 1.13 2010/07/21 15:40:04 deraadt Exp $ */
+/* $OpenBSD: conf.h,v 1.14 2011/07/04 16:52:41 nicm Exp $ */
/* $NetBSD: conf.h,v 1.2 1996/05/05 19:28:34 christos Exp $ */
/*
@@ -41,7 +41,7 @@ cdev_decl(mm);
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
(dev_type_stop((*))) enodev, 0, selfalse, \
- (dev_type_mmap((*))) enodev, 0, D_KQFILTER, dev_init(c,n,kqfilter) }
+ (dev_type_mmap((*))) enodev, 0, 0, dev_init(c,n,kqfilter) }
cdev_decl(apm);
cdev_decl(zs);
diff --git a/sys/arch/sparc/include/conf.h b/sys/arch/sparc/include/conf.h
index 574c93e42e6..7e7c264f8b3 100644
--- a/sys/arch/sparc/include/conf.h
+++ b/sys/arch/sparc/include/conf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.h,v 1.22 2010/07/21 15:40:04 deraadt Exp $ */
+/* $OpenBSD: conf.h,v 1.23 2011/07/04 16:52:41 nicm Exp $ */
/* $NetBSD: conf.h,v 1.8 1996/12/31 07:12:43 mrg Exp $ */
/*
@@ -113,5 +113,5 @@ cdev_decl(daadio);
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
(dev_type_stop((*))) enodev, 0, selfalse, \
- (dev_type_mmap((*))) enodev, 0, D_KQFILTER, dev_init(c,n,kqfilter) }
+ (dev_type_mmap((*))) enodev, 0, 0, dev_init(c,n,kqfilter) }
cdev_decl(apm);
diff --git a/sys/dev/cons.c b/sys/dev/cons.c
index df76b84d515..412533746ff 100644
--- a/sys/dev/cons.c
+++ b/sys/dev/cons.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cons.c,v 1.22 2011/07/02 22:20:07 nicm Exp $ */
+/* $OpenBSD: cons.c,v 1.23 2011/07/04 16:52:41 nicm Exp $ */
/* $NetBSD: cons.c,v 1.30 1996/04/08 19:57:30 jonathan Exp $ */
/*
@@ -217,7 +217,7 @@ cnkqfilter(dev_t dev, struct knote *kn)
return (ENXIO);
else
dev = cn_tab->cn_dev;
- if (cdevsw[major(dev)].d_flags & D_KQFILTER)
+ if (cdevsw[major(dev)].d_kqfilter)
return ((*cdevsw[major(dev)].d_kqfilter)(dev, kn));
return (ENXIO);
}
diff --git a/sys/kern/spec_vnops.c b/sys/kern/spec_vnops.c
index dca9a50fb45..0facb5b3a32 100644
--- a/sys/kern/spec_vnops.c
+++ b/sys/kern/spec_vnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: spec_vnops.c,v 1.63 2011/07/04 04:30:41 tedu Exp $ */
+/* $OpenBSD: spec_vnops.c,v 1.64 2011/07/04 16:52:41 nicm Exp $ */
/* $NetBSD: spec_vnops.c,v 1.29 1996/04/22 01:42:38 christos Exp $ */
/*
@@ -396,7 +396,7 @@ spec_kqfilter(void *v)
dev_t dev;
dev = ap->a_vp->v_rdev;
- if (cdevsw[major(dev)].d_flags & D_KQFILTER)
+ if (cdevsw[major(dev)].d_kqfilter)
return (*cdevsw[major(dev)].d_kqfilter)(dev, ap->a_kn);
return (1);
}
diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c
index dca9a50fb45..0facb5b3a32 100644
--- a/sys/miscfs/specfs/spec_vnops.c
+++ b/sys/miscfs/specfs/spec_vnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: spec_vnops.c,v 1.63 2011/07/04 04:30:41 tedu Exp $ */
+/* $OpenBSD: spec_vnops.c,v 1.64 2011/07/04 16:52:41 nicm Exp $ */
/* $NetBSD: spec_vnops.c,v 1.29 1996/04/22 01:42:38 christos Exp $ */
/*
@@ -396,7 +396,7 @@ spec_kqfilter(void *v)
dev_t dev;
dev = ap->a_vp->v_rdev;
- if (cdevsw[major(dev)].d_flags & D_KQFILTER)
+ if (cdevsw[major(dev)].d_kqfilter)
return (*cdevsw[major(dev)].d_kqfilter)(dev, ap->a_kn);
return (1);
}
diff --git a/sys/sys/conf.h b/sys/sys/conf.h
index 1cdbb8d1e60..60bd476a96a 100644
--- a/sys/sys/conf.h
+++ b/sys/sys/conf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.h,v 1.112 2011/07/03 18:11:52 nicm Exp $ */
+/* $OpenBSD: conf.h,v 1.113 2011/07/04 16:52:41 nicm Exp $ */
/* $NetBSD: conf.h,v 1.33 1996/05/03 20:03:32 christos Exp $ */
/*-
@@ -62,8 +62,7 @@ struct knote;
/*
* Flags for d_flags
*/
-#define D_KQFILTER 0x0001 /* has kqfilter entry */
-#define D_CLONE 0x0002 /* clone upon open */
+#define D_CLONE 0x0001 /* clone upon open */
#ifdef _KERNEL
@@ -185,21 +184,21 @@ extern struct cdevsw cdevsw[];
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) enodev, \
0, seltrue, (dev_type_mmap((*))) enodev, \
- D_DISK, D_KQFILTER, seltrue_kqfilter }
+ D_DISK, 0, seltrue_kqfilter }
/* open, close, read, write, ioctl */
#define cdev_tape_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) enodev, \
0, seltrue, (dev_type_mmap((*))) enodev, \
- D_TAPE, D_KQFILTER, seltrue_kqfilter }
+ D_TAPE, 0, seltrue_kqfilter }
/* open, close, read, write, ioctl, stop, tty */
#define cdev_tty_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
dev_init(c,n,write), dev_init(c,n,ioctl), dev_init(c,n,stop), \
dev_init(c,n,tty), ttpoll, (dev_type_mmap((*))) enodev, \
- D_TTY, D_KQFILTER, ttkqfilter }
+ D_TTY, 0, ttkqfilter }
/* open, close, read, ioctl, poll, nokqfilter */
#define cdev_mouse_init(c,n) { \
@@ -232,21 +231,21 @@ extern struct cdevsw cdevsw[];
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
dev_init(c,n,write), dev_init(c,n,ioctl), dev_init(c,n,stop), \
0, dev_init(c,n,poll), (dev_type_mmap((*))) enodev, \
- D_TTY, D_KQFILTER, dev_init(c,n,kqfilter) }
+ D_TTY, 0, dev_init(c,n,kqfilter) }
/* open, read, write, ioctl, poll, kqfilter -- XXX should be a tty */
#define cdev_ctty_init(c,n) { \
dev_init(c,n,open), (dev_type_close((*))) nullop, dev_init(c,n,read), \
dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) nullop, \
0, dev_init(c,n,poll), (dev_type_mmap((*))) enodev, \
- D_TTY, D_KQFILTER, ttkqfilter }
+ D_TTY, 0, ttkqfilter }
/* open, close, read, write, ioctl, mmap */
#define cdev_mm_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
dev_init(c,n,write), dev_init(c,n,ioctl), \
(dev_type_stop((*))) enodev, 0, seltrue, dev_init(c,n,mmap), \
- 0, D_KQFILTER, seltrue_kqfilter }
+ 0, 0, seltrue_kqfilter }
/* open, close, read, write, ioctl, mmap */
#define cdev_crypto_init(c,n) { \
@@ -265,7 +264,7 @@ extern struct cdevsw cdevsw[];
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) nullop, \
dev_init(c,n,tty), dev_init(c,n,poll), (dev_type_mmap((*))) enodev, \
- D_TTY, D_KQFILTER, dev_init(c,n,kqfilter) }
+ D_TTY, 0, dev_init(c,n,kqfilter) }
/* open, close, read, write, ioctl, mmap */
#define cdev_ptm_init(c,n) { \
@@ -278,7 +277,7 @@ extern struct cdevsw cdevsw[];
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
(dev_type_stop((*))) enodev, 0, dev_init(c,n,poll), \
- (dev_type_mmap((*))) enodev, 0, D_KQFILTER, dev_init(c,n,kqfilter) }
+ (dev_type_mmap((*))) enodev, 0, 0, dev_init(c,n,kqfilter) }
/* open */
#define cdev_fd_init(c,n) { \
@@ -292,7 +291,7 @@ extern struct cdevsw cdevsw[];
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) enodev, \
0, dev_init(c,n,poll), (dev_type_mmap((*))) enodev, \
- 0, D_KQFILTER, dev_init(c,n,kqfilter) }
+ 0, 0, dev_init(c,n,kqfilter) }
/* open, close, ioctl, poll, kqfilter -- XXX should be generic device */
#define cdev_vscsi_init(c,n) { \
@@ -300,21 +299,21 @@ extern struct cdevsw cdevsw[];
(dev_type_read((*))) enodev, (dev_type_write((*))) enodev, \
dev_init(c,n,ioctl), (dev_type_stop((*))) enodev, \
0, dev_init(c,n,poll), (dev_type_mmap((*))) enodev, \
- 0, D_KQFILTER, dev_init(c,n,kqfilter) }
+ 0, 0, dev_init(c,n,kqfilter) }
/* open, close, read, write, ioctl, poll, kqfilter -- XXX should be generic device */
#define cdev_pppx_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) enodev, \
0, dev_init(c,n,poll), (dev_type_mmap((*))) enodev, \
- 0, D_KQFILTER, dev_init(c,n,kqfilter) }
+ 0, 0, dev_init(c,n,kqfilter) }
/* open, close, read, write, ioctl, poll, kqfilter, cloning -- XXX should be generic device */
#define cdev_bpf_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) enodev, \
0, dev_init(c,n,poll), (dev_type_mmap((*))) enodev, \
- 0, D_KQFILTER, dev_init(c,n,kqfilter) }
+ 0, 0, dev_init(c,n,kqfilter) }
/* open, close, ioctl */
#define cdev_lkm_init(c,n) { \
@@ -349,14 +348,14 @@ extern struct cdevsw cdevsw[];
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
dev_init(c,n,write), dev_init(c,n,ioctl), \
(dev_type_stop((*))) enodev, 0, dev_init(c,n,poll), \
- dev_init(c,n,mmap), 0, D_KQFILTER, dev_init(c,n,kqfilter) }
+ dev_init(c,n,mmap), 0, 0, dev_init(c,n,kqfilter) }
/* open, close, read, write, ioctl, poll, kqfilter */
#define cdev_midi_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
dev_init(c,n,write), dev_init(c,n,ioctl), \
(dev_type_stop((*))) enodev, 0, dev_init(c,n,poll), \
- (dev_type_mmap((*))) enodev, 0, D_KQFILTER, dev_init(c,n,kqfilter) }
+ (dev_type_mmap((*))) enodev, 0, 0, dev_init(c,n,kqfilter) }
#define cdev_svr4_net_init(c,n) { \
dev_init(c,n,open), (dev_type_close((*))) enodev, \
@@ -376,21 +375,21 @@ extern struct cdevsw cdevsw[];
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
(dev_type_write((*))) enodev, (dev_type_ioctl((*))) enodev, \
(dev_type_stop((*))) enodev, 0, seltrue, \
- (dev_type_mmap((*))) enodev, 0, D_KQFILTER, seltrue_kqfilter }
+ (dev_type_mmap((*))) enodev, 0, 0, seltrue_kqfilter }
/* open, close, read, write, ioctl, stop, tty, poll, mmap, kqfilter */
#define cdev_wsdisplay_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
dev_init(c,n,write), dev_init(c,n,ioctl), dev_init(c,n,stop), \
dev_init(c,n,tty), dev_init(c,n,poll), dev_init(c,n,mmap), \
- 0, D_KQFILTER, dev_init(c,n,kqfilter) }
+ 0, 0, dev_init(c,n,kqfilter) }
/* open, close, read, write, ioctl, poll, kqfilter */
#define cdev_random_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) enodev, \
0, seltrue, (dev_type_mmap((*))) enodev, \
- 0, D_KQFILTER, seltrue_kqfilter }
+ 0, 0, seltrue_kqfilter }
/* open, close, ioctl, poll, nokqfilter */
#define cdev_usb_init(c,n) { \
@@ -422,7 +421,7 @@ extern struct cdevsw cdevsw[];
#define cdev_usbdev_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) enodev, \
- 0, dev_init(c,n,poll), (dev_type_mmap((*))) enodev, 0, D_KQFILTER, \
+ 0, dev_init(c,n,poll), (dev_type_mmap((*))) enodev, 0, 0, \
dev_init(c,n,kqfilter) }
/* open, close, init */
@@ -458,28 +457,28 @@ extern struct cdevsw cdevsw[];
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) enodev, \
0, seltrue, (dev_type_mmap((*))) enodev, \
- 0, D_KQFILTER, seltrue_kqfilter }
+ 0, 0, seltrue_kqfilter }
/* open, close, write, ioctl */
#define cdev_lpt_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) enodev, \
0, seltrue, (dev_type_mmap((*))) enodev, \
- 0, D_KQFILTER, seltrue_kqfilter }
+ 0, 0, seltrue_kqfilter }
/* open, close, read, ioctl, mmap */
#define cdev_bktr_init(c, n) { \
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
(dev_type_stop((*))) enodev, 0, seltrue, dev_init(c,n,mmap), \
- 0, D_KQFILTER, seltrue_kqfilter }
+ 0, 0, seltrue_kqfilter }
/* open, close, read, ioctl, poll, kqfilter */
#define cdev_hotplug_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
(dev_type_stop((*))) enodev, 0, dev_init(c,n,poll), \
- (dev_type_mmap((*))) enodev, 0, D_KQFILTER, dev_init(c,n,kqfilter) }
+ (dev_type_mmap((*))) enodev, 0, 0, dev_init(c,n,kqfilter) }
/* open, close, ioctl */
#define cdev_gpio_init(c,n) { \