Wed Jan 27 06:59:08 2021 UTC ()
Fix non-DIAGNOSTIC build


(skrll)
diff -r1.116 -r1.117 src/sys/kern/kern_event.c
cvs diff -r1.116 -r1.117 src/sys/kern/kern_event.c (expand / switch to unified diff)

--- src/sys/kern/kern_event.c 2021/01/26 19:09:18 1.116
+++ src/sys/kern/kern_event.c 2021/01/27 06:59:08 1.117
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: kern_event.c,v 1.116 2021/01/26 19:09:18 jdolecek Exp $ */ 1/* $NetBSD: kern_event.c,v 1.117 2021/01/27 06:59:08 skrll Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc. 4 * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Andrew Doran. 8 * by Andrew Doran.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -49,27 +49,27 @@ @@ -49,27 +49,27 @@
49 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE 49 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
50 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 50 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
51 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 51 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
52 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 52 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
53 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 53 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
54 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 54 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
55 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 55 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
56 * SUCH DAMAGE. 56 * SUCH DAMAGE.
57 * 57 *
58 * FreeBSD: src/sys/kern/kern_event.c,v 1.27 2001/07/05 17:10:44 rwatson Exp 58 * FreeBSD: src/sys/kern/kern_event.c,v 1.27 2001/07/05 17:10:44 rwatson Exp
59 */ 59 */
60 60
61#include <sys/cdefs.h> 61#include <sys/cdefs.h>
62__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.116 2021/01/26 19:09:18 jdolecek Exp $"); 62__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.117 2021/01/27 06:59:08 skrll Exp $");
63 63
64#include <sys/param.h> 64#include <sys/param.h>
65#include <sys/systm.h> 65#include <sys/systm.h>
66#include <sys/kernel.h> 66#include <sys/kernel.h>
67#include <sys/wait.h> 67#include <sys/wait.h>
68#include <sys/proc.h> 68#include <sys/proc.h>
69#include <sys/file.h> 69#include <sys/file.h>
70#include <sys/select.h> 70#include <sys/select.h>
71#include <sys/queue.h> 71#include <sys/queue.h>
72#include <sys/event.h> 72#include <sys/event.h>
73#include <sys/eventvar.h> 73#include <sys/eventvar.h>
74#include <sys/poll.h> 74#include <sys/poll.h>
75#include <sys/kmem.h> 75#include <sys/kmem.h>
@@ -825,30 +825,29 @@ filt_user(struct knote *kn, long hint) @@ -825,30 +825,29 @@ filt_user(struct knote *kn, long hint)
825 struct kqueue *kq = kn->kn_kq; 825 struct kqueue *kq = kn->kn_kq;
826 int hookid; 826 int hookid;
827 827
828 mutex_spin_enter(&kq->kq_lock); 828 mutex_spin_enter(&kq->kq_lock);
829 hookid = kn->kn_hookid; 829 hookid = kn->kn_hookid;
830 mutex_spin_exit(&kq->kq_lock); 830 mutex_spin_exit(&kq->kq_lock);
831 831
832 return hookid; 832 return hookid;
833} 833}
834 834
835static void 835static void
836filt_usertouch(struct knote *kn, struct kevent *kev, long type) 836filt_usertouch(struct knote *kn, struct kevent *kev, long type)
837{ 837{
838 struct kqueue *kq = kn->kn_kq; 
839 int ffctrl; 838 int ffctrl;
840 839
841 KASSERT(mutex_owned(&kq->kq_lock)); 840 KASSERT(mutex_owned(&kn->kn_kq->kq_lock));
842 841
843 switch (type) { 842 switch (type) {
844 case EVENT_REGISTER: 843 case EVENT_REGISTER:
845 if (kev->fflags & NOTE_TRIGGER) 844 if (kev->fflags & NOTE_TRIGGER)
846 kn->kn_hookid = 1; 845 kn->kn_hookid = 1;
847 846
848 ffctrl = kev->fflags & NOTE_FFCTRLMASK; 847 ffctrl = kev->fflags & NOTE_FFCTRLMASK;
849 kev->fflags &= NOTE_FFLAGSMASK; 848 kev->fflags &= NOTE_FFLAGSMASK;
850 switch (ffctrl) { 849 switch (ffctrl) {
851 case NOTE_FFNOP: 850 case NOTE_FFNOP:
852 break; 851 break;
853 852
854 case NOTE_FFAND: 853 case NOTE_FFAND: