diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2020-06-12 09:34:18 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2020-06-12 09:34:18 +0000 |
| commit | 02840211393a0f114b7a94723255ddbde4ed5142 (patch) | |
| tree | a9e543099351ac7bcc18d155edd8a4fc5d271562 /sys | |
| parent | 040ce6eac8aa22e0ebead0c6cfdb59763328eafb (diff) | |
Revert addition of double underbars for filter-specific flag.
Port breakages reported by naddy@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/kern/kern_event.c | 8 | ||||
| -rw-r--r-- | sys/sys/event.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 936237fd0bd..bafc8f11418 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_event.c,v 1.135 2020/06/11 09:18:43 mpi Exp $ */ +/* $OpenBSD: kern_event.c,v 1.136 2020/06/12 09:34:17 mpi Exp $ */ /*- * Copyright (c) 1999,2000,2001 Jonathan Lemon <jlemon@FreeBSD.org> @@ -268,10 +268,10 @@ filt_procattach(struct knote *kn) /* * internal flag indicating registration done by kernel */ - if (kn->kn_flags & __EV_FLAG1) { + if (kn->kn_flags & EV_FLAG1) { kn->kn_data = kn->kn_sdata; /* ppid */ kn->kn_fflags = NOTE_CHILD; - kn->kn_flags &= ~__EV_FLAG1; + kn->kn_flags &= ~EV_FLAG1; } /* XXX lock the proc here while adding to the list? */ @@ -348,7 +348,7 @@ filt_proc(struct knote *kn, long hint) memset(&kev, 0, sizeof(kev)); kev.ident = hint & NOTE_PDATAMASK; /* pid */ kev.filter = kn->kn_filter; - kev.flags = kn->kn_flags | EV_ADD | EV_ENABLE | __EV_FLAG1; + kev.flags = kn->kn_flags | EV_ADD | EV_ENABLE | EV_FLAG1; kev.fflags = kn->kn_sfflags; kev.data = kn->kn_id; /* parent */ kev.udata = kn->kn_kevent.udata; /* preserve udata */ diff --git a/sys/sys/event.h b/sys/sys/event.h index 6db296e2b24..c0e7b0846b8 100644 --- a/sys/sys/event.h +++ b/sys/sys/event.h @@ -1,4 +1,4 @@ -/* $OpenBSD: event.h,v 1.40 2020/06/11 09:18:43 mpi Exp $ */ +/* $OpenBSD: event.h,v 1.41 2020/06/12 09:34:17 mpi Exp $ */ /*- * Copyright (c) 1999,2000,2001 Jonathan Lemon <jlemon@FreeBSD.org> @@ -75,7 +75,7 @@ struct kevent { #define EV_SYSFLAGS 0xF000 /* reserved by system */ #define __EV_POLL 0x1000 /* match behavior of poll & select */ -#define __EV_FLAG1 0x2000 /* filter-specific flag */ +#define EV_FLAG1 0x2000 /* filter-specific flag */ /* returned values */ #define EV_EOF 0x8000 /* EOF detected */ |