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

2 files changed, 2 insertions, 5 deletions

diff --git a/sys/arch/mvme88k/dev/cl.c b/sys/arch/mvme88k/dev/cl.c
index d20edb82fa1..fddf67860db 100644
--- a/sys/arch/mvme88k/dev/cl.c
+++ b/sys/arch/mvme88k/dev/cl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cl.c,v 1.56 2009/10/31 12:00:07 fgsch Exp $ */
+/*	$OpenBSD: cl.c,v 1.57 2009/11/09 17:53:39 nicm Exp $ */
 
 /*
  * Copyright (c) 1995 Dale Rahn. All rights reserved.
@@ -1426,7 +1426,6 @@ cl_txintr(arg)
 						wakeup((caddr_t) &tp->t_outq);
 					}
 					selwakeup(&tp->t_wsel);
-					KNOTE(&tp->t_wsel.si_note, 0);
 				}
 				bus_space_write_1(iot, ioh, CL_IER,
 				    bus_space_read_1(iot, ioh, CL_IER) & ~0x03);
@@ -1458,7 +1457,6 @@ cl_txintr(arg)
 					wakeup((caddr_t) &tp->t_outq);
 				}
 				selwakeup(&tp->t_wsel);
-				KNOTE(&tp->t_wsel.si_note, 0);
 			}
 			bus_space_write_1(iot, ioh, CL_IER,
 			    bus_space_read_1(iot, ioh, CL_IER) & ~0x03);
diff --git a/sys/arch/mvme88k/dev/dart.c b/sys/arch/mvme88k/dev/dart.c
index ac4cc5e03b7..0fa9d848cfc 100644
--- a/sys/arch/mvme88k/dev/dart.c
+++ b/sys/arch/mvme88k/dev/dart.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dart.c,v 1.53 2009/10/31 12:00:07 fgsch Exp $	*/
+/*	$OpenBSD: dart.c,v 1.54 2009/11/09 17:53:39 nicm Exp $	*/
 
 /*
  * Mach Operating System
@@ -312,7 +312,6 @@ dartstart(struct tty *tp)
 			wakeup((caddr_t)&tp->t_outq);
 		}
 		selwakeup(&tp->t_wsel);
-		KNOTE(&tp->t_wsel.si_note, 0);
 		if (tp->t_outq.c_cc == 0)
 			goto bail;
 	}