From 9473d5ca6183970c256efe065773dda18e76cac4 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicm@cvs.openbsd.org>
Date: Mon, 9 Nov 2009 17:53:40 +0000
Subject: Every selwakeup() should have a matching KNOTE() (even if kqueue
 isn't supported it doesn't do any harm), so put the KNOTE() in selwakeup()
 itself and remove it from any occurences where both are used, except one for
 kqueue itself and one in sys_pipe.c (where the selwakeup is under a PIPE_SEL
 flag).

Based on a diff from tedu.

ok deraadt
---
 sys/dev/wscons/wsdisplay.c  | 3 +--
 sys/dev/wscons/wseventvar.h | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'sys/dev/wscons')

diff --git a/sys/dev/wscons/wsdisplay.c b/sys/dev/wscons/wsdisplay.c
index af46c2e27a0..ae36fbc7258 100644
--- a/sys/dev/wscons/wsdisplay.c
+++ b/sys/dev/wscons/wsdisplay.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsdisplay.c,v 1.96 2009/10/31 14:13:57 deraadt Exp $ */
+/* $OpenBSD: wsdisplay.c,v 1.97 2009/11/09 17:53:39 nicm Exp $ */
 /* $NetBSD: wsdisplay.c,v 1.82 2005/02/27 00:27:52 perry Exp $ */
 
 /*
@@ -1487,7 +1487,6 @@ low:
 			wakeup((caddr_t)&tp->t_outq);
 		}
 		selwakeup(&tp->t_wsel);
-		KNOTE(&tp->t_wsel.si_note, 0);
 	}
 	splx(s);
 }
diff --git a/sys/dev/wscons/wseventvar.h b/sys/dev/wscons/wseventvar.h
index f507a19d7b1..f1eeb74dcd8 100644
--- a/sys/dev/wscons/wseventvar.h
+++ b/sys/dev/wscons/wseventvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: wseventvar.h,v 1.5 2009/10/31 14:13:57 deraadt Exp $ */
+/* $OpenBSD: wseventvar.h,v 1.6 2009/11/09 17:53:39 nicm Exp $ */
 /* $NetBSD: wseventvar.h,v 1.1 1998/03/22 14:24:03 drochner Exp $ */
 
 /*
@@ -94,7 +94,6 @@ struct wseventvar {
 
 #define	WSEVENT_WAKEUP(ev) { \
 	selwakeup(&(ev)->sel); \
-	KNOTE(&(ev)->sel.si_note, 0); \
 	if ((ev)->wanted) { \
 		(ev)->wanted = 0; \
 		wakeup((caddr_t)(ev)); \
-- 
cgit v1.2.3