Module Name: src
Committed By: thorpej
Date: Sun Sep 26 01:16:11 UTC 2021
Modified Files:
src/sys/arch/amiga/dev: event.c
src/sys/arch/arc/dev: opms.c
src/sys/arch/arm/xscale: pxa2x0_apm.c
src/sys/arch/atari/dev: event.c
src/sys/arch/landisk/dev: button.c
src/sys/arch/mac68k/dev: aed.c
src/sys/arch/macppc/dev: aed.c apm.c
src/sys/arch/mips/ralink: ralink_gpio.c
src/sys/arch/sandpoint/sandpoint: satmgr.c
src/sys/arch/sparc/dev: tctrl.c
src/sys/arch/x68k/dev: event.c
src/sys/coda: coda_psdev.c
src/sys/dev: midi.c sequencer.c
src/sys/dev/apm: apm.c
src/sys/dev/audio: audio.c
src/sys/dev/hpc/apm: apmdev.c
src/sys/dev/ir: irframe_tty.c
src/sys/dev/pci: oboe.c vio9p.c xmm7360.c
src/sys/dev/putter: putter.c
src/sys/dev/qbus: qd.c
src/sys/dev/sbus: bpp.c
src/sys/dev/scsipi: ch.c
src/sys/dev/sun: event.c
src/sys/dev/sysmon: sysmon_power.c
src/sys/dev/usb: udsir.c ugen.c uhid.c uirda.c usb.c ustir.c
src/sys/dev/wscons: wsevent.c
src/sys/external/bsd/drm2/drm: drm_cdevsw.c
src/sys/kern: kern_entropy.c kern_event.c kern_sig.c subr_log.c
sys_eventfd.c sys_pipe.c sys_timerfd.c tty.c tty_pty.c
uipc_socket.c
src/sys/miscfs/fifofs: fifo_vnops.c
src/sys/miscfs/genfs: genfs_vnops.c
src/sys/net: bpf.c if_tap.c if_tun.c
src/sys/nfs: nfs_kq.c
src/sys/sys: event.h param.h
Log Message:
Change the kqueue filterops::f_isfd field to filterops::f_flags, and
define a flag FILTEROP_ISFD that has the meaning of the prior f_isfd.
Field and flag name aligned with OpenBSD.
This does not constitute a functional or ABI change, as the field location
and size, and the value placed in that field, are the same as the previous
code, but we're bumping __NetBSD_Version__ so 3rd-party module source code
can adapt, as needed.
NetBSD 9.99.89
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/amiga/dev/event.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arc/dev/opms.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/xscale/pxa2x0_apm.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/atari/dev/event.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/landisk/dev/button.c
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/mac68k/dev/aed.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/macppc/dev/aed.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/macppc/dev/apm.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/mips/ralink/ralink_gpio.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/sandpoint/sandpoint/satmgr.c
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/sparc/dev/tctrl.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/x68k/dev/event.c
cvs rdiff -u -r1.59 -r1.60 src/sys/coda/coda_psdev.c
cvs rdiff -u -r1.94 -r1.95 src/sys/dev/midi.c
cvs rdiff -u -r1.73 -r1.74 src/sys/dev/sequencer.c
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/apm/apm.c
cvs rdiff -u -r1.107 -r1.108 src/sys/dev/audio/audio.c
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/hpc/apm/apmdev.c
cvs rdiff -u -r1.64 -r1.65 src/sys/dev/ir/irframe_tty.c
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/pci/oboe.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/pci/vio9p.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/pci/xmm7360.c
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/putter/putter.c
cvs rdiff -u -r1.58 -r1.59 src/sys/dev/qbus/qd.c
cvs rdiff -u -r1.46 -r1.47 src/sys/dev/sbus/bpp.c
cvs rdiff -u -r1.93 -r1.94 src/sys/dev/scsipi/ch.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/sun/event.c
cvs rdiff -u -r1.66 -r1.67 src/sys/dev/sysmon/sysmon_power.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/usb/udsir.c
cvs rdiff -u -r1.167 -r1.168 src/sys/dev/usb/ugen.c
cvs rdiff -u -r1.117 -r1.118 src/sys/dev/usb/uhid.c
cvs rdiff -u -r1.50 -r1.51 src/sys/dev/usb/uirda.c
cvs rdiff -u -r1.196 -r1.197 src/sys/dev/usb/usb.c
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/usb/ustir.c
cvs rdiff -u -r1.46 -r1.47 src/sys/dev/wscons/wsevent.c
cvs rdiff -u -r1.15 -r1.16 src/sys/external/bsd/drm2/drm/drm_cdevsw.c
cvs rdiff -u -r1.31 -r1.32 src/sys/kern/kern_entropy.c
cvs rdiff -u -r1.120 -r1.121 src/sys/kern/kern_event.c
cvs rdiff -u -r1.397 -r1.398 src/sys/kern/kern_sig.c
cvs rdiff -u -r1.60 -r1.61 src/sys/kern/subr_log.c
cvs rdiff -u -r1.4 -r1.5 src/sys/kern/sys_eventfd.c
cvs rdiff -u -r1.153 -r1.154 src/sys/kern/sys_pipe.c
cvs rdiff -u -r1.3 -r1.4 src/sys/kern/sys_timerfd.c
cvs rdiff -u -r1.295 -r1.296 src/sys/kern/tty.c src/sys/kern/uipc_socket.c
cvs rdiff -u -r1.146 -r1.147 src/sys/kern/tty_pty.c
cvs rdiff -u -r1.83 -r1.84 src/sys/miscfs/fifofs/fifo_vnops.c
cvs rdiff -u -r1.211 -r1.212 src/sys/miscfs/genfs/genfs_vnops.c
cvs rdiff -u -r1.242 -r1.243 src/sys/net/bpf.c
cvs rdiff -u -r1.122 -r1.123 src/sys/net/if_tap.c
cvs rdiff -u -r1.162 -r1.163 src/sys/net/if_tun.c
cvs rdiff -u -r1.27 -r1.28 src/sys/nfs/nfs_kq.c
cvs rdiff -u -r1.40 -r1.41 src/sys/sys/event.h
cvs rdiff -u -r1.701 -r1.702 src/sys/sys/param.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amiga/dev/event.c
diff -u src/sys/arch/amiga/dev/event.c:1.15 src/sys/arch/amiga/dev/event.c:1.16
--- src/sys/arch/amiga/dev/event.c:1.15 Sat Dec 19 15:12:17 2020
+++ src/sys/arch/amiga/dev/event.c Sun Sep 26 01:16:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: event.c,v 1.15 2020/12/19 15:12:17 thorpej Exp $ */
+/* $NetBSD: event.c,v 1.16 2021/09/26 01:16:07 thorpej Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: event.c,v 1.15 2020/12/19 15:12:17 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: event.c,v 1.16 2021/09/26 01:16:07 thorpej Exp $");
/*
* Internal `Firm_event' interface for the keyboard and mouse drivers.
@@ -191,7 +191,7 @@ filt_evread(struct knote *kn, long hint)
}
static const struct filterops ev_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_evrdetach,
.f_event = filt_evread,
Index: src/sys/arch/arc/dev/opms.c
diff -u src/sys/arch/arc/dev/opms.c:1.24 src/sys/arch/arc/dev/opms.c:1.25
--- src/sys/arch/arc/dev/opms.c:1.24 Sat Dec 19 15:15:04 2020
+++ src/sys/arch/arc/dev/opms.c Sun Sep 26 01:16:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: opms.c,v 1.24 2020/12/19 15:15:04 thorpej Exp $ */
+/* $NetBSD: opms.c,v 1.25 2021/09/26 01:16:07 thorpej Exp $ */
/* $OpenBSD: pccons.c,v 1.22 1999/01/30 22:39:37 imp Exp $ */
/* NetBSD: pms.c,v 1.21 1995/04/18 02:25:18 mycroft Exp */
@@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opms.c,v 1.24 2020/12/19 15:15:04 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opms.c,v 1.25 2021/09/26 01:16:07 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -473,7 +473,7 @@ filt_opmsread(struct knote *kn, long hin
}
static const struct filterops opmsread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_opmsrdetach,
.f_event = filt_opmsread,
Index: src/sys/arch/arm/xscale/pxa2x0_apm.c
diff -u src/sys/arch/arm/xscale/pxa2x0_apm.c:1.5 src/sys/arch/arm/xscale/pxa2x0_apm.c:1.6
--- src/sys/arch/arm/xscale/pxa2x0_apm.c:1.5 Fri Oct 30 22:20:38 2020
+++ src/sys/arch/arm/xscale/pxa2x0_apm.c Sun Sep 26 01:16:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pxa2x0_apm.c,v 1.5 2020/10/30 22:20:38 christos Exp $ */
+/* $NetBSD: pxa2x0_apm.c,v 1.6 2021/09/26 01:16:07 thorpej Exp $ */
/* $OpenBSD: pxa2x0_apm.c,v 1.28 2007/03/29 18:42:38 uwe Exp $ */
/*-
@@ -105,7 +105,7 @@ int filt_apmread(struct knote *kn, long
int apmkqfilter(dev_t dev, struct knote *kn);
static const struct filterops apmread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_apmrdetach,
.f_event = filt_apmread,
Index: src/sys/arch/atari/dev/event.c
diff -u src/sys/arch/atari/dev/event.c:1.15 src/sys/arch/atari/dev/event.c:1.16
--- src/sys/arch/atari/dev/event.c:1.15 Sat Dec 19 15:18:04 2020
+++ src/sys/arch/atari/dev/event.c Sun Sep 26 01:16:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: event.c,v 1.15 2020/12/19 15:18:04 thorpej Exp $ */
+/* $NetBSD: event.c,v 1.16 2021/09/26 01:16:07 thorpej Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: event.c,v 1.15 2020/12/19 15:18:04 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: event.c,v 1.16 2021/09/26 01:16:07 thorpej Exp $");
#include <sys/param.h>
#include <sys/fcntl.h>
@@ -191,7 +191,7 @@ filt_evread(struct knote *kn, long hint)
}
static const struct filterops ev_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_evrdetach,
.f_event = filt_evread,
Index: src/sys/arch/landisk/dev/button.c
diff -u src/sys/arch/landisk/dev/button.c:1.11 src/sys/arch/landisk/dev/button.c:1.12
--- src/sys/arch/landisk/dev/button.c:1.11 Thu Jul 15 05:07:50 2021
+++ src/sys/arch/landisk/dev/button.c Sun Sep 26 01:16:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: button.c,v 1.11 2021/07/15 05:07:50 rin Exp $ */
+/* $NetBSD: button.c,v 1.12 2021/09/26 01:16:07 thorpej Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: button.c,v 1.11 2021/07/15 05:07:50 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: button.c,v 1.12 2021/09/26 01:16:07 thorpej Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -306,14 +306,14 @@ filt_btn_read(struct knote *kn, long hin
}
static const struct filterops btn_read_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_btn_rdetach,
.f_event = filt_btn_read,
};
static const struct filterops btn_write_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_btn_rdetach,
.f_event = filt_seltrue,
Index: src/sys/arch/mac68k/dev/aed.c
diff -u src/sys/arch/mac68k/dev/aed.c:1.35 src/sys/arch/mac68k/dev/aed.c:1.36
--- src/sys/arch/mac68k/dev/aed.c:1.35 Sat Dec 19 21:46:40 2020
+++ src/sys/arch/mac68k/dev/aed.c Sun Sep 26 01:16:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: aed.c,v 1.35 2020/12/19 21:46:40 thorpej Exp $ */
+/* $NetBSD: aed.c,v 1.36 2021/09/26 01:16:07 thorpej Exp $ */
/*
* Copyright (C) 1994 Bradley A. Grantham
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aed.c,v 1.35 2020/12/19 21:46:40 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aed.c,v 1.36 2021/09/26 01:16:07 thorpej Exp $");
#include "opt_adb.h"
@@ -598,14 +598,14 @@ filt_aedread(struct knote *kn, long hint
}
static const struct filterops aedread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_aedrdetach,
.f_event = filt_aedread,
};
static const struct filterops aed_seltrue_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_aedrdetach,
.f_event = filt_seltrue,
Index: src/sys/arch/macppc/dev/aed.c
diff -u src/sys/arch/macppc/dev/aed.c:1.31 src/sys/arch/macppc/dev/aed.c:1.32
--- src/sys/arch/macppc/dev/aed.c:1.31 Sat Dec 19 21:54:42 2020
+++ src/sys/arch/macppc/dev/aed.c Sun Sep 26 01:16:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: aed.c,v 1.31 2020/12/19 21:54:42 thorpej Exp $ */
+/* $NetBSD: aed.c,v 1.32 2021/09/26 01:16:07 thorpej Exp $ */
/*
* Copyright (C) 1994 Bradley A. Grantham
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aed.c,v 1.31 2020/12/19 21:54:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aed.c,v 1.32 2021/09/26 01:16:07 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -603,14 +603,14 @@ filt_aedread(struct knote *kn, long hint
}
static const struct filterops aedread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_aedrdetach,
.f_event = filt_aedread
};
static const struct filterops aed_seltrue_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_aedrdetach,
.f_event = filt_seltrue
Index: src/sys/arch/macppc/dev/apm.c
diff -u src/sys/arch/macppc/dev/apm.c:1.29 src/sys/arch/macppc/dev/apm.c:1.30
--- src/sys/arch/macppc/dev/apm.c:1.29 Sat Dec 19 21:54:42 2020
+++ src/sys/arch/macppc/dev/apm.c Sun Sep 26 01:16:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: apm.c,v 1.29 2020/12/19 21:54:42 thorpej Exp $ */
+/* $NetBSD: apm.c,v 1.30 2021/09/26 01:16:07 thorpej Exp $ */
/* $OpenBSD: apm.c,v 1.5 2002/06/07 07:13:59 miod Exp $ */
/*-
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: apm.c,v 1.29 2020/12/19 21:54:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apm.c,v 1.30 2021/09/26 01:16:07 thorpej Exp $");
#include "apm.h"
@@ -432,7 +432,7 @@ filt_apmread(struct knote *kn, long hint
}
static struct filterops apmread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_apmrdetach,
.f_event = filt_apmread,
Index: src/sys/arch/mips/ralink/ralink_gpio.c
diff -u src/sys/arch/mips/ralink/ralink_gpio.c:1.12 src/sys/arch/mips/ralink/ralink_gpio.c:1.13
--- src/sys/arch/mips/ralink/ralink_gpio.c:1.12 Fri Sep 3 22:33:17 2021
+++ src/sys/arch/mips/ralink/ralink_gpio.c Sun Sep 26 01:16:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ralink_gpio.c,v 1.12 2021/09/03 22:33:17 andvar Exp $ */
+/* $NetBSD: ralink_gpio.c,v 1.13 2021/09/26 01:16:07 thorpej Exp $ */
/*-
* Copyright (c) 2011 CradlePoint Technology, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
/* ra_gpio.c -- Ralink 3052 gpio driver */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ralink_gpio.c,v 1.12 2021/09/03 22:33:17 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ralink_gpio.c,v 1.13 2021/09/26 01:16:07 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -495,7 +495,7 @@ static int gpio_event_app_user_event(st
static struct klist knotes;
static int app_filter_id;
static struct filterops app_fops = {
- .f_isfd = 0,
+ .f_flags = 0,
.f_attach = gpio_event_app_user_attach,
.f_detach = gpio_event_app_user_detach,
.f_event = gpio_event_app_user_event,
Index: src/sys/arch/sandpoint/sandpoint/satmgr.c
diff -u src/sys/arch/sandpoint/sandpoint/satmgr.c:1.30 src/sys/arch/sandpoint/sandpoint/satmgr.c:1.31
--- src/sys/arch/sandpoint/sandpoint/satmgr.c:1.30 Wed Mar 17 14:50:11 2021
+++ src/sys/arch/sandpoint/sandpoint/satmgr.c Sun Sep 26 01:16:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: satmgr.c,v 1.30 2021/03/17 14:50:11 rin Exp $ */
+/* $NetBSD: satmgr.c,v 1.31 2021/09/26 01:16:08 thorpej Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -607,7 +607,7 @@ filt_read(struct knote *kn, long hint)
}
static const struct filterops read_filtops ={
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_rdetach,
.f_event = filt_read,
Index: src/sys/arch/sparc/dev/tctrl.c
diff -u src/sys/arch/sparc/dev/tctrl.c:1.63 src/sys/arch/sparc/dev/tctrl.c:1.64
--- src/sys/arch/sparc/dev/tctrl.c:1.63 Mon Jan 4 15:29:34 2021
+++ src/sys/arch/sparc/dev/tctrl.c Sun Sep 26 01:16:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tctrl.c,v 1.63 2021/01/04 15:29:34 thorpej Exp $ */
+/* $NetBSD: tctrl.c,v 1.64 2021/09/26 01:16:08 thorpej Exp $ */
/*-
* Copyright (c) 1998, 2005, 2006 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tctrl.c,v 1.63 2021/01/04 15:29:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tctrl.c,v 1.64 2021/09/26 01:16:08 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1232,7 +1232,7 @@ filt_tctrlread(struct knote *kn, long hi
}
static const struct filterops tctrlread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_tctrlrdetach,
.f_event = filt_tctrlread,
Index: src/sys/arch/x68k/dev/event.c
diff -u src/sys/arch/x68k/dev/event.c:1.17 src/sys/arch/x68k/dev/event.c:1.18
--- src/sys/arch/x68k/dev/event.c:1.17 Sat Dec 19 22:16:15 2020
+++ src/sys/arch/x68k/dev/event.c Sun Sep 26 01:16:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: event.c,v 1.17 2020/12/19 22:16:15 thorpej Exp $ */
+/* $NetBSD: event.c,v 1.18 2021/09/26 01:16:08 thorpej Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: event.c,v 1.17 2020/12/19 22:16:15 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: event.c,v 1.18 2021/09/26 01:16:08 thorpej Exp $");
#include <sys/param.h>
#include <sys/fcntl.h>
@@ -217,7 +217,7 @@ filt_evread(struct knote *kn, long hint)
}
static const struct filterops ev_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_evrdetach,
.f_event = filt_evread,
Index: src/sys/coda/coda_psdev.c
diff -u src/sys/coda/coda_psdev.c:1.59 src/sys/coda/coda_psdev.c:1.60
--- src/sys/coda/coda_psdev.c:1.59 Sat Dec 19 22:11:57 2020
+++ src/sys/coda/coda_psdev.c Sun Sep 26 01:16:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: coda_psdev.c,v 1.59 2020/12/19 22:11:57 thorpej Exp $ */
+/* $NetBSD: coda_psdev.c,v 1.60 2021/09/26 01:16:08 thorpej Exp $ */
/*
*
@@ -54,7 +54,7 @@
/* These routines are the device entry points for Venus. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: coda_psdev.c,v 1.59 2020/12/19 22:11:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: coda_psdev.c,v 1.60 2021/09/26 01:16:08 thorpej Exp $");
extern int coda_nc_initialized; /* Set if cache has been initialized */
@@ -487,7 +487,7 @@ filt_vc_nb_read(struct knote *kn, long h
}
static const struct filterops vc_nb_read_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_vc_nb_detach,
.f_event = filt_vc_nb_read,
Index: src/sys/dev/midi.c
diff -u src/sys/dev/midi.c:1.94 src/sys/dev/midi.c:1.95
--- src/sys/dev/midi.c:1.94 Sat Aug 7 16:19:08 2021
+++ src/sys/dev/midi.c Sun Sep 26 01:16:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: midi.c,v 1.94 2021/08/07 16:19:08 thorpej Exp $ */
+/* $NetBSD: midi.c,v 1.95 2021/09/26 01:16:08 thorpej Exp $ */
/*
* Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: midi.c,v 1.94 2021/08/07 16:19:08 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: midi.c,v 1.95 2021/09/26 01:16:08 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "midi.h"
@@ -1764,7 +1764,7 @@ filt_midiread(struct knote *kn, long hin
}
static const struct filterops midiread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_midirdetach,
.f_event = filt_midiread,
@@ -1812,7 +1812,7 @@ filt_midiwrite(struct knote *kn, long hi
}
static const struct filterops midiwrite_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_midiwdetach,
.f_event = filt_midiwrite,
Index: src/sys/dev/sequencer.c
diff -u src/sys/dev/sequencer.c:1.73 src/sys/dev/sequencer.c:1.74
--- src/sys/dev/sequencer.c:1.73 Sat Dec 19 01:18:58 2020
+++ src/sys/dev/sequencer.c Sun Sep 26 01:16:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sequencer.c,v 1.73 2020/12/19 01:18:58 thorpej Exp $ */
+/* $NetBSD: sequencer.c,v 1.74 2021/09/26 01:16:08 thorpej Exp $ */
/*
* Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sequencer.c,v 1.73 2020/12/19 01:18:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sequencer.c,v 1.74 2021/09/26 01:16:08 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "sequencer.h"
@@ -927,7 +927,7 @@ filt_sequencerread(struct knote *kn, lon
}
static const struct filterops sequencerread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_sequencerrdetach,
.f_event = filt_sequencerread,
@@ -965,7 +965,7 @@ filt_sequencerwrite(struct knote *kn, lo
}
static const struct filterops sequencerwrite_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_sequencerwdetach,
.f_event = filt_sequencerwrite,
Index: src/sys/dev/apm/apm.c
diff -u src/sys/dev/apm/apm.c:1.34 src/sys/dev/apm/apm.c:1.35
--- src/sys/dev/apm/apm.c:1.34 Sat Dec 19 01:18:58 2020
+++ src/sys/dev/apm/apm.c Sun Sep 26 01:16:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: apm.c,v 1.34 2020/12/19 01:18:58 thorpej Exp $ */
+/* $NetBSD: apm.c,v 1.35 2021/09/26 01:16:08 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: apm.c,v 1.34 2020/12/19 01:18:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apm.c,v 1.35 2021/09/26 01:16:08 thorpej Exp $");
#include "opt_apm.h"
@@ -884,7 +884,7 @@ filt_apmread(struct knote *kn, long hint
}
static const struct filterops apmread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_apmrdetach,
.f_event = filt_apmread,
Index: src/sys/dev/audio/audio.c
diff -u src/sys/dev/audio/audio.c:1.107 src/sys/dev/audio/audio.c:1.108
--- src/sys/dev/audio/audio.c:1.107 Tue Sep 7 13:24:46 2021
+++ src/sys/dev/audio/audio.c Sun Sep 26 01:16:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: audio.c,v 1.107 2021/09/07 13:24:46 andvar Exp $ */
+/* $NetBSD: audio.c,v 1.108 2021/09/26 01:16:08 thorpej Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -138,7 +138,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.107 2021/09/07 13:24:46 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.108 2021/09/26 01:16:08 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "audio.h"
@@ -3296,7 +3296,7 @@ audio_poll(struct audio_softc *sc, int e
}
static const struct filterops audioread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_audioread_detach,
.f_event = filt_audioread_event,
@@ -3343,7 +3343,7 @@ filt_audioread_event(struct knote *kn, l
}
static const struct filterops audiowrite_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_audiowrite_detach,
.f_event = filt_audiowrite_event,
Index: src/sys/dev/hpc/apm/apmdev.c
diff -u src/sys/dev/hpc/apm/apmdev.c:1.33 src/sys/dev/hpc/apm/apmdev.c:1.34
--- src/sys/dev/hpc/apm/apmdev.c:1.33 Sat Dec 19 01:18:59 2020
+++ src/sys/dev/hpc/apm/apmdev.c Sun Sep 26 01:16:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: apmdev.c,v 1.33 2020/12/19 01:18:59 thorpej Exp $ */
+/* $NetBSD: apmdev.c,v 1.34 2021/09/26 01:16:08 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: apmdev.c,v 1.33 2020/12/19 01:18:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apmdev.c,v 1.34 2021/09/26 01:16:08 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_apm.h"
@@ -925,7 +925,7 @@ filt_apmread(struct knote *kn, long hint
}
static const struct filterops apmread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_apmrdetach,
.f_event = filt_apmread,
Index: src/sys/dev/ir/irframe_tty.c
diff -u src/sys/dev/ir/irframe_tty.c:1.64 src/sys/dev/ir/irframe_tty.c:1.65
--- src/sys/dev/ir/irframe_tty.c:1.64 Sat Dec 19 01:18:59 2020
+++ src/sys/dev/ir/irframe_tty.c Sun Sep 26 01:16:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: irframe_tty.c,v 1.64 2020/12/19 01:18:59 thorpej Exp $ */
+/* $NetBSD: irframe_tty.c,v 1.65 2021/09/26 01:16:09 thorpej Exp $ */
/*
* TODO
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: irframe_tty.c,v 1.64 2020/12/19 01:18:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: irframe_tty.c,v 1.65 2021/09/26 01:16:09 thorpej Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -830,14 +830,14 @@ filt_irframetwrite(struct knote *kn, lon
}
static const struct filterops irframetread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_irframetrdetach,
.f_event = filt_irframetread,
};
static const struct filterops irframetwrite_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_irframetwdetach,
.f_event = filt_irframetwrite,
Index: src/sys/dev/pci/oboe.c
diff -u src/sys/dev/pci/oboe.c:1.49 src/sys/dev/pci/oboe.c:1.50
--- src/sys/dev/pci/oboe.c:1.49 Sat Aug 7 16:19:14 2021
+++ src/sys/dev/pci/oboe.c Sun Sep 26 01:16:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: oboe.c,v 1.49 2021/08/07 16:19:14 thorpej Exp $ */
+/* $NetBSD: oboe.c,v 1.50 2021/09/26 01:16:09 thorpej Exp $ */
/* XXXXFVDL THIS DRIVER IS BROKEN FOR NON-i386 -- vtophys() usage */
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: oboe.c,v 1.49 2021/08/07 16:19:14 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: oboe.c,v 1.50 2021/09/26 01:16:09 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -495,14 +495,14 @@ filt_oboewdetach(struct knote *kn)
}
static const struct filterops oboeread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_oboerdetach,
.f_event = filt_oboeread,
};
static const struct filterops oboewrite_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_oboewdetach,
.f_event = filt_seltrue,
Index: src/sys/dev/pci/vio9p.c
diff -u src/sys/dev/pci/vio9p.c:1.3 src/sys/dev/pci/vio9p.c:1.4
--- src/sys/dev/pci/vio9p.c:1.3 Wed Jan 20 19:46:48 2021
+++ src/sys/dev/pci/vio9p.c Sun Sep 26 01:16:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vio9p.c,v 1.3 2021/01/20 19:46:48 reinoud Exp $ */
+/* $NetBSD: vio9p.c,v 1.4 2021/09/26 01:16:09 thorpej Exp $ */
/*
* Copyright (c) 2019 Internet Initiative Japan, Inc.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vio9p.c,v 1.3 2021/01/20 19:46:48 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vio9p.c,v 1.4 2021/09/26 01:16:09 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -408,7 +408,7 @@ filt_vio9p_read(struct knote *kn, long h
}
static const struct filterops vio9p_read_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_vio9p_detach,
.f_event = filt_vio9p_read,
@@ -424,7 +424,7 @@ filt_vio9p_write(struct knote *kn, long
}
static const struct filterops vio9p_write_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_vio9p_detach,
.f_event = filt_vio9p_write,
Index: src/sys/dev/pci/xmm7360.c
diff -u src/sys/dev/pci/xmm7360.c:1.9 src/sys/dev/pci/xmm7360.c:1.10
--- src/sys/dev/pci/xmm7360.c:1.9 Sat Aug 7 16:19:14 2021
+++ src/sys/dev/pci/xmm7360.c Sun Sep 26 01:16:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: xmm7360.c,v 1.9 2021/08/07 16:19:14 thorpej Exp $ */
+/* $NetBSD: xmm7360.c,v 1.10 2021/09/26 01:16:09 thorpej Exp $ */
/*
* Device driver for Intel XMM7360 LTE modems, eg. Fibocom L850-GL.
@@ -75,7 +75,7 @@ MODULE_DEVICE_TABLE(pci, xmm7360_ids);
#include "opt_gateway.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xmm7360.c,v 1.9 2021/08/07 16:19:14 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xmm7360.c,v 1.10 2021/09/26 01:16:09 thorpej Exp $");
#endif
#include <sys/param.h>
@@ -261,7 +261,7 @@ typedef struct kmutex spinlock_t;
SLIST_INSERT_HEAD(klist, kn, kn_selnext)
#define klist_remove(klist, kn) \
SLIST_REMOVE(klist, kn, knote, kn_selnext)
-#define XMM_KQ_ISFD_INITIALIZER .f_isfd = 1
+#define XMM_KQ_ISFD_INITIALIZER .f_flags = FILTEROP_ISFD
#define tty_lock() mutex_spin_enter(&tty_lock)
#define tty_unlock() mutex_spin_exit(&tty_lock)
#define tty_locked() KASSERT(mutex_owned(&tty_lock))
Index: src/sys/dev/putter/putter.c
diff -u src/sys/dev/putter/putter.c:1.38 src/sys/dev/putter/putter.c:1.39
--- src/sys/dev/putter/putter.c:1.38 Fri Dec 18 02:54:34 2020
+++ src/sys/dev/putter/putter.c Sun Sep 26 01:16:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: putter.c,v 1.38 2020/12/18 02:54:34 thorpej Exp $ */
+/* $NetBSD: putter.c,v 1.39 2021/09/26 01:16:09 thorpej Exp $ */
/*
* Copyright (c) 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: putter.c,v 1.38 2020/12/18 02:54:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: putter.c,v 1.39 2021/09/26 01:16:09 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -492,7 +492,7 @@ filt_putter(struct knote *kn, long hint)
}
static const struct filterops putter_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_putterdetach,
.f_event = filt_putter,
Index: src/sys/dev/qbus/qd.c
diff -u src/sys/dev/qbus/qd.c:1.58 src/sys/dev/qbus/qd.c:1.59
--- src/sys/dev/qbus/qd.c:1.58 Fri Dec 18 02:41:35 2020
+++ src/sys/dev/qbus/qd.c Sun Sep 26 01:16:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: qd.c,v 1.58 2020/12/18 02:41:35 thorpej Exp $ */
+/* $NetBSD: qd.c,v 1.59 2021/09/26 01:16:09 thorpej Exp $ */
/*-
* Copyright (c) 1988 Regents of the University of California.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: qd.c,v 1.58 2020/12/18 02:41:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qd.c,v 1.59 2021/09/26 01:16:09 thorpej Exp $");
#include "opt_ddb.h"
@@ -1581,14 +1581,14 @@ filt_qdwrite(struct knote *kn, long hint
}
static const struct filterops qdread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_qdrdetach,
.f_event = filt_qdread,
};
static const struct filterops qdwrite_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_qdrdetach,
.f_event = filt_qdwrite,
Index: src/sys/dev/sbus/bpp.c
diff -u src/sys/dev/sbus/bpp.c:1.46 src/sys/dev/sbus/bpp.c:1.47
--- src/sys/dev/sbus/bpp.c:1.46 Fri Dec 18 02:04:17 2020
+++ src/sys/dev/sbus/bpp.c Sun Sep 26 01:16:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: bpp.c,v 1.46 2020/12/18 02:04:17 thorpej Exp $ */
+/* $NetBSD: bpp.c,v 1.47 2021/09/26 01:16:09 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bpp.c,v 1.46 2020/12/18 02:04:17 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bpp.c,v 1.47 2021/09/26 01:16:09 thorpej Exp $");
#include <sys/param.h>
#include <sys/ioctl.h>
@@ -521,7 +521,7 @@ filt_bppread(struct knote *kn, long hint
}
static const struct filterops bppread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_bpprdetach,
.f_event = filt_bppread,
@@ -551,7 +551,7 @@ filt_bpfwrite(struct knote *kn, long hin
}
static const struct filterops bppwrite_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_bppwdetach,
.f_event = filt_bpfwrite,
Index: src/sys/dev/scsipi/ch.c
diff -u src/sys/dev/scsipi/ch.c:1.93 src/sys/dev/scsipi/ch.c:1.94
--- src/sys/dev/scsipi/ch.c:1.93 Fri Dec 18 01:55:22 2020
+++ src/sys/dev/scsipi/ch.c Sun Sep 26 01:16:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ch.c,v 1.93 2020/12/18 01:55:22 thorpej Exp $ */
+/* $NetBSD: ch.c,v 1.94 2021/09/26 01:16:09 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999, 2004 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ch.c,v 1.93 2020/12/18 01:55:22 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ch.c,v 1.94 2021/09/26 01:16:09 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -488,14 +488,14 @@ filt_chread(struct knote *kn, long hint)
}
static const struct filterops chread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_chdetach,
.f_event = filt_chread,
};
static const struct filterops chwrite_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_chdetach,
.f_event = filt_seltrue,
Index: src/sys/dev/sun/event.c
diff -u src/sys/dev/sun/event.c:1.25 src/sys/dev/sun/event.c:1.26
--- src/sys/dev/sun/event.c:1.25 Fri Dec 18 01:54:22 2020
+++ src/sys/dev/sun/event.c Sun Sep 26 01:16:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: event.c,v 1.25 2020/12/18 01:54:22 thorpej Exp $ */
+/* $NetBSD: event.c,v 1.26 2021/09/26 01:16:09 thorpej Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: event.c,v 1.25 2020/12/18 01:54:22 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: event.c,v 1.26 2021/09/26 01:16:09 thorpej Exp $");
#include <sys/param.h>
#include <sys/fcntl.h>
@@ -197,7 +197,7 @@ filt_evread(struct knote *kn, long hint)
}
static const struct filterops ev_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_evrdetach,
.f_event = filt_evread,
Index: src/sys/dev/sysmon/sysmon_power.c
diff -u src/sys/dev/sysmon/sysmon_power.c:1.66 src/sys/dev/sysmon/sysmon_power.c:1.67
--- src/sys/dev/sysmon/sysmon_power.c:1.66 Fri Dec 18 01:46:39 2020
+++ src/sys/dev/sysmon/sysmon_power.c Sun Sep 26 01:16:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_power.c,v 1.66 2020/12/18 01:46:39 thorpej Exp $ */
+/* $NetBSD: sysmon_power.c,v 1.67 2021/09/26 01:16:09 thorpej Exp $ */
/*-
* Copyright (c) 2007 Juan Romero Pardines.
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon_power.c,v 1.66 2020/12/18 01:46:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_power.c,v 1.67 2021/09/26 01:16:09 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -554,14 +554,14 @@ filt_sysmon_power_read(struct knote *kn,
}
static const struct filterops sysmon_power_read_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_sysmon_power_rdetach,
.f_event = filt_sysmon_power_read,
};
static const struct filterops sysmon_power_write_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_sysmon_power_rdetach,
.f_event = filt_seltrue,
Index: src/sys/dev/usb/udsir.c
diff -u src/sys/dev/usb/udsir.c:1.14 src/sys/dev/usb/udsir.c:1.15
--- src/sys/dev/usb/udsir.c:1.14 Sat Aug 7 16:19:17 2021
+++ src/sys/dev/usb/udsir.c Sun Sep 26 01:16:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: udsir.c,v 1.14 2021/08/07 16:19:17 thorpej Exp $ */
+/* $NetBSD: udsir.c,v 1.15 2021/09/26 01:16:09 thorpej Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udsir.c,v 1.14 2021/08/07 16:19:17 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udsir.c,v 1.15 2021/09/26 01:16:09 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -663,14 +663,14 @@ udsir_poll(void *h, int events, struct l
}
static const struct filterops udsirread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_udsirrdetach,
.f_event = filt_udsirread,
};
static const struct filterops udsirwrite_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_udsirwdetach,
.f_event = filt_udsirwrite,
Index: src/sys/dev/usb/ugen.c
diff -u src/sys/dev/usb/ugen.c:1.167 src/sys/dev/usb/ugen.c:1.168
--- src/sys/dev/usb/ugen.c:1.167 Tue Sep 7 10:44:04 2021
+++ src/sys/dev/usb/ugen.c Sun Sep 26 01:16:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ugen.c,v 1.167 2021/09/07 10:44:04 riastradh Exp $ */
+/* $NetBSD: ugen.c,v 1.168 2021/09/26 01:16:09 thorpej Exp $ */
/*
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.167 2021/09/07 10:44:04 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.168 2021/09/26 01:16:09 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -2230,28 +2230,28 @@ filt_ugenwrite_bulk(struct knote *kn, lo
}
static const struct filterops ugenread_intr_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_ugenrdetach,
.f_event = filt_ugenread_intr,
};
static const struct filterops ugenread_isoc_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_ugenrdetach,
.f_event = filt_ugenread_isoc,
};
static const struct filterops ugenread_bulk_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_ugenrdetach,
.f_event = filt_ugenread_bulk,
};
static const struct filterops ugenwrite_bulk_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_ugenrdetach,
.f_event = filt_ugenwrite_bulk,
Index: src/sys/dev/usb/uhid.c
diff -u src/sys/dev/usb/uhid.c:1.117 src/sys/dev/usb/uhid.c:1.118
--- src/sys/dev/usb/uhid.c:1.117 Fri Dec 18 01:40:20 2020
+++ src/sys/dev/usb/uhid.c Sun Sep 26 01:16:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: uhid.c,v 1.117 2020/12/18 01:40:20 thorpej Exp $ */
+/* $NetBSD: uhid.c,v 1.118 2021/09/26 01:16:09 thorpej Exp $ */
/*
* Copyright (c) 1998, 2004, 2008, 2012 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.117 2020/12/18 01:40:20 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.118 2021/09/26 01:16:09 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -856,14 +856,14 @@ filt_uhidread(struct knote *kn, long hin
}
static const struct filterops uhidread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_uhidrdetach,
.f_event = filt_uhidread,
};
static const struct filterops uhid_seltrue_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_uhidrdetach,
.f_event = filt_seltrue,
Index: src/sys/dev/usb/uirda.c
diff -u src/sys/dev/usb/uirda.c:1.50 src/sys/dev/usb/uirda.c:1.51
--- src/sys/dev/usb/uirda.c:1.50 Sat Aug 7 16:19:17 2021
+++ src/sys/dev/usb/uirda.c Sun Sep 26 01:16:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: uirda.c,v 1.50 2021/08/07 16:19:17 thorpej Exp $ */
+/* $NetBSD: uirda.c,v 1.51 2021/09/26 01:16:09 thorpej Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uirda.c,v 1.50 2021/08/07 16:19:17 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uirda.c,v 1.51 2021/09/26 01:16:09 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -641,14 +641,14 @@ filt_uirdawdetach(struct knote *kn)
}
static const struct filterops uirdaread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_uirdardetach,
.f_event = filt_uirdaread,
};
static const struct filterops uirdawrite_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_uirdawdetach,
.f_event = filt_seltrue,
Index: src/sys/dev/usb/usb.c
diff -u src/sys/dev/usb/usb.c:1.196 src/sys/dev/usb/usb.c:1.197
--- src/sys/dev/usb/usb.c:1.196 Sun Jun 13 14:48:10 2021
+++ src/sys/dev/usb/usb.c Sun Sep 26 01:16:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: usb.c,v 1.196 2021/06/13 14:48:10 riastradh Exp $ */
+/* $NetBSD: usb.c,v 1.197 2021/09/26 01:16:09 thorpej Exp $ */
/*
* Copyright (c) 1998, 2002, 2008, 2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.196 2021/06/13 14:48:10 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.197 2021/09/26 01:16:09 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -1134,7 +1134,7 @@ filt_usbread(struct knote *kn, long hint
}
static const struct filterops usbread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_usbrdetach,
.f_event = filt_usbread,
Index: src/sys/dev/usb/ustir.c
diff -u src/sys/dev/usb/ustir.c:1.49 src/sys/dev/usb/ustir.c:1.50
--- src/sys/dev/usb/ustir.c:1.49 Sat Aug 7 16:19:17 2021
+++ src/sys/dev/usb/ustir.c Sun Sep 26 01:16:09 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ustir.c,v 1.49 2021/08/07 16:19:17 thorpej Exp $ */
+/* $NetBSD: ustir.c,v 1.50 2021/09/26 01:16:09 thorpej Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ustir.c,v 1.49 2021/08/07 16:19:17 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ustir.c,v 1.50 2021/09/26 01:16:09 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -1095,14 +1095,14 @@ filt_ustirwrite(struct knote *kn, long h
}
static const struct filterops ustirread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_ustirrdetach,
.f_event = filt_ustirread,
};
static const struct filterops ustirwrite_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_ustirwdetach,
.f_event = filt_ustirwrite,
Index: src/sys/dev/wscons/wsevent.c
diff -u src/sys/dev/wscons/wsevent.c:1.46 src/sys/dev/wscons/wsevent.c:1.47
--- src/sys/dev/wscons/wsevent.c:1.46 Fri Dec 18 01:41:23 2020
+++ src/sys/dev/wscons/wsevent.c Sun Sep 26 01:16:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: wsevent.c,v 1.46 2020/12/18 01:41:23 thorpej Exp $ */
+/* $NetBSD: wsevent.c,v 1.47 2021/09/26 01:16:10 thorpej Exp $ */
/*-
* Copyright (c) 2006, 2008 The NetBSD Foundation, Inc.
@@ -104,7 +104,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsevent.c,v 1.46 2020/12/18 01:41:23 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsevent.c,v 1.47 2021/09/26 01:16:10 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -326,7 +326,7 @@ filt_wseventread(struct knote *kn, long
}
static const struct filterops wsevent_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_wseventrdetach,
.f_event = filt_wseventread,
Index: src/sys/external/bsd/drm2/drm/drm_cdevsw.c
diff -u src/sys/external/bsd/drm2/drm/drm_cdevsw.c:1.15 src/sys/external/bsd/drm2/drm/drm_cdevsw.c:1.16
--- src/sys/external/bsd/drm2/drm/drm_cdevsw.c:1.15 Sat Dec 19 22:09:15 2020
+++ src/sys/external/bsd/drm2/drm/drm_cdevsw.c Sun Sep 26 01:16:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_cdevsw.c,v 1.15 2020/12/19 22:09:15 thorpej Exp $ */
+/* $NetBSD: drm_cdevsw.c,v 1.16 2021/09/26 01:16:10 thorpej Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_cdevsw.c,v 1.15 2020/12/19 22:09:15 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_cdevsw.c,v 1.16 2021/09/26 01:16:10 thorpej Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -386,7 +386,7 @@ static void filt_drm_detach(struct knote
static int filt_drm_event(struct knote *, long);
static const struct filterops drm_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_drm_detach,
.f_event = filt_drm_event,
Index: src/sys/kern/kern_entropy.c
diff -u src/sys/kern/kern_entropy.c:1.31 src/sys/kern/kern_entropy.c:1.32
--- src/sys/kern/kern_entropy.c:1.31 Tue Sep 21 14:54:26 2021
+++ src/sys/kern/kern_entropy.c Sun Sep 26 01:16:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_entropy.c,v 1.31 2021/09/21 14:54:26 christos Exp $ */
+/* $NetBSD: kern_entropy.c,v 1.32 2021/09/26 01:16:10 thorpej Exp $ */
/*-
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_entropy.c,v 1.31 2021/09/21 14:54:26 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_entropy.c,v 1.32 2021/09/26 01:16:10 thorpej Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -1466,7 +1466,7 @@ filt_entropy_read_event(struct knote *kn
}
static const struct filterops entropy_read_filtops = {
- .f_isfd = 1, /* XXX Makes sense only for /dev/u?random. */
+ .f_flags = FILTEROP_ISFD,/* XXX Makes sense only for /dev/u?random. */
.f_attach = NULL,
.f_detach = filt_entropy_read_detach,
.f_event = filt_entropy_read_event,
Index: src/sys/kern/kern_event.c
diff -u src/sys/kern/kern_event.c:1.120 src/sys/kern/kern_event.c:1.121
--- src/sys/kern/kern_event.c:1.120 Tue Sep 21 14:54:02 2021
+++ src/sys/kern/kern_event.c Sun Sep 26 01:16:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_event.c,v 1.120 2021/09/21 14:54:02 christos Exp $ */
+/* $NetBSD: kern_event.c,v 1.121 2021/09/26 01:16:10 thorpej Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.120 2021/09/21 14:54:02 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.121 2021/09/26 01:16:10 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -130,42 +130,42 @@ static const struct fileops kqueueops =
};
static const struct filterops kqread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_kqdetach,
.f_event = filt_kqueue,
};
static const struct filterops proc_filtops = {
- .f_isfd = 0,
+ .f_flags = 0,
.f_attach = filt_procattach,
.f_detach = filt_procdetach,
.f_event = filt_proc,
};
static const struct filterops file_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = filt_fileattach,
.f_detach = NULL,
.f_event = NULL,
};
static const struct filterops timer_filtops = {
- .f_isfd = 0,
+ .f_flags = 0,
.f_attach = filt_timerattach,
.f_detach = filt_timerdetach,
.f_event = filt_timer,
};
static const struct filterops fs_filtops = {
- .f_isfd = 0,
+ .f_flags = 0,
.f_attach = filt_fsattach,
.f_detach = filt_fsdetach,
.f_event = filt_fs,
};
static const struct filterops user_filtops = {
- .f_isfd = 0,
+ .f_flags = 0,
.f_attach = filt_userattach,
.f_detach = filt_userdetach,
.f_event = filt_user,
@@ -921,7 +921,7 @@ filt_seltruedetach(struct knote *kn)
}
const struct filterops seltrue_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_seltruedetach,
.f_event = filt_seltrue,
@@ -1145,7 +1145,7 @@ kqueue_register(struct kqueue *kq, struc
}
/* search if knote already exists */
- if (kfilter->filtops->f_isfd) {
+ if (kfilter->filtops->f_flags & FILTEROP_ISFD) {
/* monitoring a file descriptor */
/* validate descriptor */
if (kev->ident > INT_MAX
@@ -1211,7 +1211,7 @@ kqueue_register(struct kqueue *kq, struc
*/
fp = NULL;
- if (!kn->kn_fop->f_isfd) {
+ if (!(kn->kn_fop->f_flags & FILTEROP_ISFD)) {
/*
* If knote is not on an fd, store on
* internal hash table.
@@ -1274,7 +1274,8 @@ kqueue_register(struct kqueue *kq, struc
*/
kn->kn_kevent.udata = kev->udata;
KASSERT(kn->kn_fop != NULL);
- if (!kn->kn_fop->f_isfd && kn->kn_fop->f_touch != NULL) {
+ if (!(kn->kn_fop->f_flags & FILTEROP_ISFD) &&
+ kn->kn_fop->f_touch != NULL) {
mutex_spin_enter(&kq->kq_lock);
(*kn->kn_fop->f_touch)(kn, kev, EVENT_REGISTER);
mutex_spin_exit(&kq->kq_lock);
@@ -1533,7 +1534,7 @@ relock:
}
}
KASSERT(kn->kn_fop != NULL);
- touch = (!kn->kn_fop->f_isfd &&
+ touch = (!(kn->kn_fop->f_flags & FILTEROP_ISFD) &&
kn->kn_fop->f_touch != NULL);
/* XXXAD should be got from f_event if !oneshot. */
if (touch) {
@@ -1878,7 +1879,7 @@ knote_detach(struct knote *kn, filedesc_
}
/* Remove from descriptor table. */
- if (kn->kn_fop->f_isfd)
+ if (kn->kn_fop->f_flags & FILTEROP_ISFD)
list = (struct klist *)&fdp->fd_dt->dt_ff[kn->kn_id]->ff_knlist;
else
list = &fdp->fd_knhash[KN_HASH(kn->kn_id, fdp->fd_knhashmask)];
@@ -1901,7 +1902,7 @@ again:
mutex_spin_exit(&kq->kq_lock);
mutex_exit(&fdp->fd_lock);
- if (kn->kn_fop->f_isfd)
+ if (kn->kn_fop->f_flags & FILTEROP_ISFD)
fd_putfile(kn->kn_id);
atomic_dec_uint(&kn->kn_kfilter->refcnt);
kmem_free(kn, sizeof(*kn));
Index: src/sys/kern/kern_sig.c
diff -u src/sys/kern/kern_sig.c:1.397 src/sys/kern/kern_sig.c:1.398
--- src/sys/kern/kern_sig.c:1.397 Sat Apr 3 11:19:11 2021
+++ src/sys/kern/kern_sig.c Sun Sep 26 01:16:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_sig.c,v 1.397 2021/04/03 11:19:11 simonb Exp $ */
+/* $NetBSD: kern_sig.c,v 1.398 2021/09/26 01:16:10 thorpej Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008, 2019 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.397 2021/04/03 11:19:11 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.398 2021/09/26 01:16:10 thorpej Exp $");
#include "opt_execfmt.h"
#include "opt_ptrace.h"
@@ -2693,7 +2693,7 @@ filt_signal(struct knote *kn, long hint)
}
const struct filterops sig_filtops = {
- .f_isfd = 0,
+ .f_flags = 0,
.f_attach = filt_sigattach,
.f_detach = filt_sigdetach,
.f_event = filt_signal,
Index: src/sys/kern/subr_log.c
diff -u src/sys/kern/subr_log.c:1.60 src/sys/kern/subr_log.c:1.61
--- src/sys/kern/subr_log.c:1.60 Fri Dec 11 03:00:09 2020
+++ src/sys/kern/subr_log.c Sun Sep 26 01:16:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_log.c,v 1.60 2020/12/11 03:00:09 thorpej Exp $ */
+/* $NetBSD: subr_log.c,v 1.61 2021/09/26 01:16:10 thorpej Exp $ */
/*-
* Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_log.c,v 1.60 2020/12/11 03:00:09 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_log.c,v 1.61 2021/09/26 01:16:10 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -290,7 +290,7 @@ filt_logread(struct knote *kn, long hint
}
static const struct filterops logread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_logrdetach,
.f_event = filt_logread,
Index: src/sys/kern/sys_eventfd.c
diff -u src/sys/kern/sys_eventfd.c:1.4 src/sys/kern/sys_eventfd.c:1.5
--- src/sys/kern/sys_eventfd.c:1.4 Mon Sep 20 14:30:05 2021
+++ src/sys/kern/sys_eventfd.c Sun Sep 26 01:16:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_eventfd.c,v 1.4 2021/09/20 14:30:05 thorpej Exp $ */
+/* $NetBSD: sys_eventfd.c,v 1.5 2021/09/26 01:16:10 thorpej Exp $ */
/*-
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_eventfd.c,v 1.4 2021/09/20 14:30:05 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_eventfd.c,v 1.5 2021/09/26 01:16:10 thorpej Exp $");
/*
* eventfd
@@ -425,7 +425,7 @@ eventfd_filt_read(struct knote * const k
}
static const struct filterops eventfd_read_filterops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_detach = eventfd_filt_read_detach,
.f_event = eventfd_filt_read,
};
@@ -462,7 +462,7 @@ eventfd_filt_write(struct knote * const
}
static const struct filterops eventfd_write_filterops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_detach = eventfd_filt_write_detach,
.f_event = eventfd_filt_write,
};
Index: src/sys/kern/sys_pipe.c
diff -u src/sys/kern/sys_pipe.c:1.153 src/sys/kern/sys_pipe.c:1.154
--- src/sys/kern/sys_pipe.c:1.153 Tue Sep 7 13:24:46 2021
+++ src/sys/kern/sys_pipe.c Sun Sep 26 01:16:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_pipe.c,v 1.153 2021/09/07 13:24:46 andvar Exp $ */
+/* $NetBSD: sys_pipe.c,v 1.154 2021/09/26 01:16:10 thorpej Exp $ */
/*-
* Copyright (c) 2003, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_pipe.c,v 1.153 2021/09/07 13:24:46 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_pipe.c,v 1.154 2021/09/26 01:16:10 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1095,14 +1095,14 @@ filt_pipewrite(struct knote *kn, long hi
}
static const struct filterops pipe_rfiltops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_pipedetach,
.f_event = filt_piperead,
};
static const struct filterops pipe_wfiltops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_pipedetach,
.f_event = filt_pipewrite,
Index: src/sys/kern/sys_timerfd.c
diff -u src/sys/kern/sys_timerfd.c:1.3 src/sys/kern/sys_timerfd.c:1.4
--- src/sys/kern/sys_timerfd.c:1.3 Mon Sep 20 11:12:35 2021
+++ src/sys/kern/sys_timerfd.c Sun Sep 26 01:16:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_timerfd.c,v 1.3 2021/09/20 11:12:35 skrll Exp $ */
+/* $NetBSD: sys_timerfd.c,v 1.4 2021/09/26 01:16:10 thorpej Exp $ */
/*-
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_timerfd.c,v 1.3 2021/09/20 11:12:35 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_timerfd.c,v 1.4 2021/09/26 01:16:10 thorpej Exp $");
/*
* timerfd
@@ -421,7 +421,7 @@ timerfd_filt_read(struct knote * const k
}
static const struct filterops timerfd_read_filterops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_detach = timerfd_filt_read_detach,
.f_event = timerfd_filt_read,
};
Index: src/sys/kern/tty.c
diff -u src/sys/kern/tty.c:1.295 src/sys/kern/tty.c:1.296
--- src/sys/kern/tty.c:1.295 Fri Dec 11 03:00:09 2020
+++ src/sys/kern/tty.c Sun Sep 26 01:16:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tty.c,v 1.295 2020/12/11 03:00:09 thorpej Exp $ */
+/* $NetBSD: tty.c,v 1.296 2021/09/26 01:16:10 thorpej Exp $ */
/*-
* Copyright (c) 2008, 2020 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tty.c,v 1.295 2020/12/11 03:00:09 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tty.c,v 1.296 2021/09/26 01:16:10 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -1515,14 +1515,14 @@ filt_ttywrite(struct knote *kn, long hin
}
static const struct filterops ttyread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_ttyrdetach,
.f_event = filt_ttyread,
};
static const struct filterops ttywrite_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_ttywdetach,
.f_event = filt_ttywrite,
Index: src/sys/kern/uipc_socket.c
diff -u src/sys/kern/uipc_socket.c:1.295 src/sys/kern/uipc_socket.c:1.296
--- src/sys/kern/uipc_socket.c:1.295 Tue Aug 3 20:27:08 2021
+++ src/sys/kern/uipc_socket.c Sun Sep 26 01:16:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_socket.c,v 1.295 2021/08/03 20:27:08 chs Exp $ */
+/* $NetBSD: uipc_socket.c,v 1.296 2021/09/26 01:16:10 thorpej Exp $ */
/*
* Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.295 2021/08/03 20:27:08 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.296 2021/09/26 01:16:10 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -2322,21 +2322,21 @@ filt_solisten(struct knote *kn, long hin
}
static const struct filterops solisten_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_sordetach,
.f_event = filt_solisten,
};
static const struct filterops soread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_sordetach,
.f_event = filt_soread,
};
static const struct filterops sowrite_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_sowdetach,
.f_event = filt_sowrite,
Index: src/sys/kern/tty_pty.c
diff -u src/sys/kern/tty_pty.c:1.146 src/sys/kern/tty_pty.c:1.147
--- src/sys/kern/tty_pty.c:1.146 Fri Dec 11 03:00:09 2020
+++ src/sys/kern/tty_pty.c Sun Sep 26 01:16:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tty_pty.c,v 1.146 2020/12/11 03:00:09 thorpej Exp $ */
+/* $NetBSD: tty_pty.c,v 1.147 2021/09/26 01:16:10 thorpej Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tty_pty.c,v 1.146 2020/12/11 03:00:09 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tty_pty.c,v 1.147 2021/09/26 01:16:10 thorpej Exp $");
#include "opt_ptm.h"
@@ -1002,14 +1002,14 @@ filt_ptcwrite(struct knote *kn, long hin
}
static const struct filterops ptcread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_ptcrdetach,
.f_event = filt_ptcread,
};
static const struct filterops ptcwrite_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_ptcwdetach,
.f_event = filt_ptcwrite,
Index: src/sys/miscfs/fifofs/fifo_vnops.c
diff -u src/sys/miscfs/fifofs/fifo_vnops.c:1.83 src/sys/miscfs/fifofs/fifo_vnops.c:1.84
--- src/sys/miscfs/fifofs/fifo_vnops.c:1.83 Tue Jun 29 22:34:08 2021
+++ src/sys/miscfs/fifofs/fifo_vnops.c Sun Sep 26 01:16:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: fifo_vnops.c,v 1.83 2021/06/29 22:34:08 dholland Exp $ */
+/* $NetBSD: fifo_vnops.c,v 1.84 2021/09/26 01:16:10 thorpej Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fifo_vnops.c,v 1.83 2021/06/29 22:34:08 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fifo_vnops.c,v 1.84 2021/09/26 01:16:10 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -580,14 +580,14 @@ filt_fifowrite(struct knote *kn, long hi
}
static const struct filterops fiforead_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_fifordetach,
.f_event = filt_fiforead,
};
static const struct filterops fifowrite_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_fifowdetach,
.f_event = filt_fifowrite,
Index: src/sys/miscfs/genfs/genfs_vnops.c
diff -u src/sys/miscfs/genfs/genfs_vnops.c:1.211 src/sys/miscfs/genfs/genfs_vnops.c:1.212
--- src/sys/miscfs/genfs/genfs_vnops.c:1.211 Tue Jun 29 22:34:08 2021
+++ src/sys/miscfs/genfs/genfs_vnops.c Sun Sep 26 01:16:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: genfs_vnops.c,v 1.211 2021/06/29 22:34:08 dholland Exp $ */
+/* $NetBSD: genfs_vnops.c,v 1.212 2021/09/26 01:16:10 thorpej Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfs_vnops.c,v 1.211 2021/06/29 22:34:08 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfs_vnops.c,v 1.212 2021/09/26 01:16:10 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -596,21 +596,21 @@ filt_genfsvnode(struct knote *kn, long h
}
static const struct filterops genfsread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_genfsdetach,
.f_event = filt_genfsread,
};
static const struct filterops genfswrite_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_genfsdetach,
.f_event = filt_genfswrite,
};
static const struct filterops genfsvnode_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_genfsdetach,
.f_event = filt_genfsvnode,
Index: src/sys/net/bpf.c
diff -u src/sys/net/bpf.c:1.242 src/sys/net/bpf.c:1.243
--- src/sys/net/bpf.c:1.242 Thu Sep 16 22:19:11 2021
+++ src/sys/net/bpf.c Sun Sep 26 01:16:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: bpf.c,v 1.242 2021/09/16 22:19:11 andvar Exp $ */
+/* $NetBSD: bpf.c,v 1.243 2021/09/26 01:16:10 thorpej Exp $ */
/*
* Copyright (c) 1990, 1991, 1993
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.242 2021/09/16 22:19:11 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.243 2021/09/26 01:16:10 thorpej Exp $");
#if defined(_KERNEL_OPT)
#include "opt_bpf.h"
@@ -1561,7 +1561,7 @@ filt_bpfread(struct knote *kn, long hint
}
static const struct filterops bpfread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_bpfrdetach,
.f_event = filt_bpfread,
Index: src/sys/net/if_tap.c
diff -u src/sys/net/if_tap.c:1.122 src/sys/net/if_tap.c:1.123
--- src/sys/net/if_tap.c:1.122 Wed Jun 16 00:21:19 2021
+++ src/sys/net/if_tap.c Sun Sep 26 01:16:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tap.c,v 1.122 2021/06/16 00:21:19 riastradh Exp $ */
+/* $NetBSD: if_tap.c,v 1.123 2021/09/26 01:16:10 thorpej Exp $ */
/*
* Copyright (c) 2003, 2004, 2008, 2009 The NetBSD Foundation.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.122 2021/06/16 00:21:19 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.123 2021/09/26 01:16:10 thorpej Exp $");
#if defined(_KERNEL_OPT)
@@ -1169,14 +1169,14 @@ tap_dev_poll(int unit, int events, struc
}
static struct filterops tap_read_filterops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = tap_kqdetach,
.f_event = tap_kqread,
};
static struct filterops tap_seltrue_filterops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = tap_kqdetach,
.f_event = filt_seltrue,
Index: src/sys/net/if_tun.c
diff -u src/sys/net/if_tun.c:1.162 src/sys/net/if_tun.c:1.163
--- src/sys/net/if_tun.c:1.162 Fri Dec 18 01:31:49 2020
+++ src/sys/net/if_tun.c Sun Sep 26 01:16:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tun.c,v 1.162 2020/12/18 01:31:49 thorpej Exp $ */
+/* $NetBSD: if_tun.c,v 1.163 2021/09/26 01:16:10 thorpej Exp $ */
/*
* Copyright (c) 1988, Julian Onions <[email protected]>
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1.162 2020/12/18 01:31:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1.163 2021/09/26 01:16:10 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1082,14 +1082,14 @@ filt_tunread(struct knote *kn, long hint
}
static const struct filterops tunread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_tunrdetach,
.f_event = filt_tunread,
};
static const struct filterops tun_seltrue_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_tunrdetach,
.f_event = filt_seltrue,
Index: src/sys/nfs/nfs_kq.c
diff -u src/sys/nfs/nfs_kq.c:1.27 src/sys/nfs/nfs_kq.c:1.28
--- src/sys/nfs/nfs_kq.c:1.27 Sat Sep 5 16:30:12 2020
+++ src/sys/nfs/nfs_kq.c Sun Sep 26 01:16:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_kq.c,v 1.27 2020/09/05 16:30:12 riastradh Exp $ */
+/* $NetBSD: nfs_kq.c,v 1.28 2021/09/26 01:16:10 thorpej Exp $ */
/*-
* Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_kq.c,v 1.27 2020/09/05 16:30:12 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_kq.c,v 1.28 2021/09/26 01:16:10 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -277,14 +277,14 @@ filt_nfsvnode(struct knote *kn, long hin
static const struct filterops nfsread_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_nfsdetach,
.f_event = filt_nfsread,
};
static const struct filterops nfsvnode_filtops = {
- .f_isfd = 1,
+ .f_flags = FILTEROP_ISFD,
.f_attach = NULL,
.f_detach = filt_nfsdetach,
.f_event = filt_nfsvnode,
Index: src/sys/sys/event.h
diff -u src/sys/sys/event.h:1.40 src/sys/sys/event.h:1.41
--- src/sys/sys/event.h:1.40 Sat Oct 31 14:55:52 2020
+++ src/sys/sys/event.h Sun Sep 26 01:16:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: event.h,v 1.40 2020/10/31 14:55:52 christos Exp $ */
+/* $NetBSD: event.h,v 1.41 2021/09/26 01:16:10 thorpej Exp $ */
/*-
* Copyright (c) 1999,2000,2001 Jonathan Lemon <[email protected]>
@@ -209,7 +209,7 @@ struct kfilter_mapping {
* Callback methods for each filter type.
*/
struct filterops {
- int f_isfd; /* true if ident == filedescriptor */
+ int f_flags; /* flags; see below */
int (*f_attach) (struct knote *);
/* called when knote is ADDed */
void (*f_detach) (struct knote *);
@@ -219,6 +219,9 @@ struct filterops {
void (*f_touch) (struct knote *, struct kevent *, long);
};
+/* filterops flags */
+#define FILTEROP_ISFD __BIT(0) /* ident == file descriptor */
+
/*
* Field locking:
*
Index: src/sys/sys/param.h
diff -u src/sys/sys/param.h:1.701 src/sys/sys/param.h:1.702
--- src/sys/sys/param.h:1.701 Sat Aug 7 19:44:39 2021
+++ src/sys/sys/param.h Sun Sep 26 01:16:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.701 2021/08/07 19:44:39 thorpej Exp $ */
+/* $NetBSD: param.h,v 1.702 2021/09/26 01:16:10 thorpej Exp $ */
/*-
* Copyright (c) 1982, 1986, 1989, 1993
@@ -67,7 +67,7 @@
* 2.99.9 (299000900)
*/
-#define __NetBSD_Version__ 999008800 /* NetBSD 9.99.88 */
+#define __NetBSD_Version__ 999008900 /* NetBSD 9.99.89 */
#define __NetBSD_Prereq__(M,m,p) (((((M) * 100000000) + \
(m) * 1000000) + (p) * 100) <= __NetBSD_Version__)
