summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2020-05-13 08:10:04 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2020-05-13 08:10:04 +0000
commit7003704898fbda4c266de4228251653b6d83125a (patch)
tree839443d101f5b00f599da8aa8da5ac8ca9481c98 /sys
parent9e52a2c89ae7851f36a4a907633b48ce39ffc8f2 (diff)
Match direct `seltrue' usages with a corresponding `seltrue_kqfilter'.
This ensure spec_kqfilter() won't return an error when spec_poll() returns success for a given device. ok visa@
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/arm64/arm64/conf.c6
-rw-r--r--sys/arch/luna88k/include/conf.h4
-rw-r--r--sys/arch/sparc64/include/conf.h4
-rw-r--r--sys/sys/conf.h4
4 files changed, 9 insertions, 9 deletions
diff --git a/sys/arch/arm64/arm64/conf.c b/sys/arch/arm64/arm64/conf.c
index 2d98de8f62e..3d131bcfa34 100644
--- a/sys/arch/arm64/arm64/conf.c
+++ b/sys/arch/arm64/arm64/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.12 2020/01/23 02:40:21 dlg Exp $ */
+/* $OpenBSD: conf.c,v 1.13 2020/05/13 08:10:03 mpi Exp $ */
/*
* Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved.
@@ -83,7 +83,7 @@ int nblkdev = nitems(bdevsw);
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_type_mmap((*))) enodev }
+ (dev_type_mmap((*))) enodev, 0, 0, seltrue_kqfilter }
/* open, close, ioctl, select -- XXX should be a generic device */
#define cdev_ocis_init(c,n) { \
@@ -97,7 +97,7 @@ int nblkdev = nitems(bdevsw);
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 }
+ (dev_type_mmap((*))) enodev, 0, 0, seltrue_kqfilter }
#define mmread mmrw
diff --git a/sys/arch/luna88k/include/conf.h b/sys/arch/luna88k/include/conf.h
index 08949da8876..0b79af80e1d 100644
--- a/sys/arch/luna88k/include/conf.h
+++ b/sys/arch/luna88k/include/conf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.h,v 1.5 2016/12/17 05:22:34 aoyama Exp $ */
+/* $OpenBSD: conf.h,v 1.6 2020/05/13 08:10:03 mpi Exp $ */
/*
* Copyright (c) 2004, Miodrag Vallat.
* All rights reserved.
@@ -53,7 +53,7 @@ cdev_decl(wd);
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, seltrue, (dev_type_mmap((*))) enodev, 0, 0, seltrue_kqfilter }
/* open, close, ioctl, mmap */
#define cdev_pcex_init(c,n) { \
diff --git a/sys/arch/sparc64/include/conf.h b/sys/arch/sparc64/include/conf.h
index cbf5d889a22..558c0c22ef7 100644
--- a/sys/arch/sparc64/include/conf.h
+++ b/sys/arch/sparc64/include/conf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.h,v 1.24 2012/12/08 20:38:10 kettenis Exp $ */
+/* $OpenBSD: conf.h,v 1.25 2020/05/13 08:10:03 mpi Exp $ */
/* $NetBSD: conf.h,v 1.9 2001/03/26 12:33:26 lukem Exp $ */
/*-
@@ -124,6 +124,6 @@ cdev_decl(sbpp);
#define cdev_bpp_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((*))) nullop, \
- 0, seltrue, (dev_type_mmap((*))) enodev }
+ 0, seltrue, (dev_type_mmap((*))) enodev, 0, 0, seltrue_kqfilter }
cdev_decl(bpp);
diff --git a/sys/sys/conf.h b/sys/sys/conf.h
index 48470a0d19e..6531db84b22 100644
--- a/sys/sys/conf.h
+++ b/sys/sys/conf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.h,v 1.150 2020/04/21 08:29:27 mpi Exp $ */
+/* $OpenBSD: conf.h,v 1.151 2020/05/13 08:10:03 mpi Exp $ */
/* $NetBSD: conf.h,v 1.33 1996/05/03 20:03:32 christos Exp $ */
/*-
@@ -200,7 +200,7 @@ extern struct cdevsw cdevsw[];
(dev_type_open((*))) enodev, (dev_type_close((*))) enodev, \
(dev_type_read((*))) enodev, (dev_type_write((*))) enodev, \
(dev_type_ioctl((*))) enodev, (dev_type_stop((*))) enodev, \
- 0, seltrue, (dev_type_mmap((*))) enodev }
+ 0, seltrue, (dev_type_mmap((*))) enodev, 0, 0, seltrue_kqfilter }
/* open, close, read, write, ioctl, poll, kqfilter -- XXX should be a tty */
#define cdev_cn_init(c,n) { \