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

4 files changed, 4 insertions, 10 deletions

diff --git a/sys/arch/mvme68k/dev/cl.c b/sys/arch/mvme68k/dev/cl.c
index 015e1d454b9..35119d47c6d 100644
--- a/sys/arch/mvme68k/dev/cl.c
+++ b/sys/arch/mvme68k/dev/cl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cl.c,v 1.49 2009/10/31 12:00:06 fgsch Exp $ */
+/*	$OpenBSD: cl.c,v 1.50 2009/11/09 17:53:39 nicm Exp $ */
 
 /*
  * Copyright (c) 1995 Dale Rahn. All rights reserved.
@@ -1555,7 +1555,6 @@ cl_txintr(arg)
 							wakeup((caddr_t) &tp->t_outq);
 						}
 						selwakeup(&tp->t_wsel);
-						KNOTE(&tp->t_wsel.si_note, 0);
 					}
 					sc->cl_reg->cl_ier = sc->cl_reg->cl_ier & ~0x3;
 				}
@@ -1589,7 +1588,6 @@ cl_txintr(arg)
 					wakeup((caddr_t) &tp->t_outq);
 				}
 				selwakeup(&tp->t_wsel);
-				KNOTE(&tp->t_wsel.si_note, 0);
 			}
 			sc->cl_reg->cl_ier = sc->cl_reg->cl_ier & ~0x3;
 		}
diff --git a/sys/arch/mvme68k/dev/dart.c b/sys/arch/mvme68k/dev/dart.c
index ef1bf842934..a2d37e8b3c7 100644
--- a/sys/arch/mvme68k/dev/dart.c
+++ b/sys/arch/mvme68k/dev/dart.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dart.c,v 1.4 2009/10/31 12:00:07 fgsch Exp $	*/
+/*	$OpenBSD: dart.c,v 1.5 2009/11/09 17:53:39 nicm Exp $	*/
 
 /*
  * Mach Operating System
@@ -283,7 +283,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;
 	}
diff --git a/sys/arch/mvme68k/dev/wl.c b/sys/arch/mvme68k/dev/wl.c
index 684f2416541..f350d99728d 100644
--- a/sys/arch/mvme68k/dev/wl.c
+++ b/sys/arch/mvme68k/dev/wl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wl.c,v 1.20 2009/10/31 12:00:07 fgsch Exp $ */
+/*	$OpenBSD: wl.c,v 1.21 2009/11/09 17:53:39 nicm Exp $ */
 
 /*
  * Copyright (c) 1995 Dale Rahn. All rights reserved.
@@ -1218,7 +1218,6 @@ cl_txintr(sc)
 					wakeup((caddr_t) &tp->t_outq);
 				}
 				selwakeup(&tp->t_wsel);
-				KNOTE(&tp->t_wsel.si_note, 0);
 			}
 			sc->cl_reg->cl_ier = sc->cl_reg->cl_ier & ~(IER_TXMPTY|IER_TXD);
 		}
diff --git a/sys/arch/mvme68k/dev/zs.c b/sys/arch/mvme68k/dev/zs.c
index 25dd8368c64..14d8fa9007a 100644
--- a/sys/arch/mvme68k/dev/zs.c
+++ b/sys/arch/mvme68k/dev/zs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: zs.c,v 1.29 2009/10/31 12:00:07 fgsch Exp $ */
+/*	$OpenBSD: zs.c,v 1.30 2009/11/09 17:53:39 nicm Exp $ */
 
 /*
  * Copyright (c) 2000 Steve Murphree, Jr.
@@ -564,7 +564,6 @@ zsstop(tp, flag)
 				wakeup((caddr_t) & tp->t_outq);
 			}
 			selwakeup(&tp->t_wsel);
-			KNOTE(&tp->t_wsel.si_note, 0);
 		}
 	}
 	splx(s);
@@ -913,7 +912,6 @@ zs_softint(arg)
 					wakeup((caddr_t) & tp->t_outq);
 				}
 				selwakeup(&tp->t_wsel);
-				KNOTE(&tp->t_wsel.si_note, 0);
 			}
 			if (tp->t_line != 0)
 				(*linesw[tp->t_line].l_start) (tp);