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

34 files changed, 34 insertions, 75 deletions

diff --git a/sys/arch/alpha/alpha/promcons.c b/sys/arch/alpha/alpha/promcons.c
index 31a893c8775..ad333ab7a26 100644
--- a/sys/arch/alpha/alpha/promcons.c
+++ b/sys/arch/alpha/alpha/promcons.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: promcons.c,v 1.11 2009/10/31 12:00:05 fgsch Exp $	*/
+/*	$OpenBSD: promcons.c,v 1.12 2009/11/09 17:53:38 nicm Exp $	*/
 /*	$NetBSD: promcons.c,v 1.5 1996/11/13 22:20:55 cgd Exp $	*/
 
 /*
@@ -191,7 +191,6 @@ promstart(tp)
 			wakeup((caddr_t)&tp->t_outq);
 		}
 		selwakeup(&tp->t_wsel);
-		KNOTE(&tp->t_wsel.si_note, 0);
 	}
 	tp->t_state |= TS_BUSY;
 	while (tp->t_outq.c_cc != 0)
diff --git a/sys/arch/alpha/tc/scc.c b/sys/arch/alpha/tc/scc.c
index 6977c5fb7f4..b8fdf3a5e18 100644
--- a/sys/arch/alpha/tc/scc.c
+++ b/sys/arch/alpha/tc/scc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scc.c,v 1.24 2009/10/31 12:00:05 fgsch Exp $ */
+/* $OpenBSD: scc.c,v 1.25 2009/11/09 17:53:38 nicm Exp $ */
 /* $NetBSD: scc.c,v 1.58 2002/03/17 19:40:27 atatat Exp $ */
 
 /*
@@ -927,7 +927,6 @@ sccstart(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 out;
@@ -947,7 +946,6 @@ sccstart(tp)
 				wakeup((caddr_t)&tp->t_outq);
 			}
 			selwakeup(&tp->t_wsel);
-			KNOTE(&tp->t_wsel.si_note, 0);
 		}
 		goto out;
 	}
diff --git a/sys/arch/arm/s3c2xx0/sscom.c b/sys/arch/arm/s3c2xx0/sscom.c
index db5fec6d27a..ce00fe50322 100644
--- a/sys/arch/arm/s3c2xx0/sscom.c
+++ b/sys/arch/arm/s3c2xx0/sscom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sscom.c,v 1.14 2009/11/04 19:14:09 kettenis Exp $ */
+/*	$OpenBSD: sscom.c,v 1.15 2009/11/09 17:53:38 nicm Exp $ */
 /*	$NetBSD: sscom.c,v 1.29 2008/06/11 22:37:21 cegger Exp $ */
 
 /*
@@ -1370,7 +1370,6 @@ sscomstart(struct tty *tp)
 			wakeup(&tp->t_outq);
 		}
 		selwakeup(&tp->t_wsel);
-		KNOTE(&tp->t_wsel.si_note, 0);
 		if (tp->t_outq.c_cc == 0)
 			goto out;
 	}
diff --git a/sys/arch/aviion/dev/dart.c b/sys/arch/aviion/dev/dart.c
index 6f8d3e275b5..ab0698ec9aa 100644
--- a/sys/arch/aviion/dev/dart.c
+++ b/sys/arch/aviion/dev/dart.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dart.c,v 1.6 2009/10/31 12:00:05 fgsch Exp $	*/
+/*	$OpenBSD: dart.c,v 1.7 2009/11/09 17:53:38 nicm Exp $	*/
 
 /*
  * Mach Operating System
@@ -268,7 +268,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/hp300/dev/apci.c b/sys/arch/hp300/dev/apci.c
index 82bfe395228..935107d921e 100644
--- a/sys/arch/hp300/dev/apci.c
+++ b/sys/arch/hp300/dev/apci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: apci.c,v 1.36 2009/11/01 20:29:00 nicm Exp $	*/
+/*	$OpenBSD: apci.c,v 1.37 2009/11/09 17:53:38 nicm Exp $	*/
 /*	$NetBSD: apci.c,v 1.9 2000/11/02 00:35:05 eeh Exp $	*/
 
 /*-
@@ -768,7 +768,6 @@ apcistart(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 out;
 	}
diff --git a/sys/arch/hp300/dev/dca.c b/sys/arch/hp300/dev/dca.c
index 3b9013aff8c..40ace43a431 100644
--- a/sys/arch/hp300/dev/dca.c
+++ b/sys/arch/hp300/dev/dca.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dca.c,v 1.37 2009/11/01 20:29:00 nicm Exp $	*/
+/*	$OpenBSD: dca.c,v 1.38 2009/11/09 17:53:38 nicm Exp $	*/
 /*	$NetBSD: dca.c,v 1.35 1997/05/05 20:58:18 thorpej Exp $	*/
 
 /*
@@ -867,7 +867,6 @@ dcastart(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 out;
 	}
diff --git a/sys/arch/hp300/dev/dcm.c b/sys/arch/hp300/dev/dcm.c
index faecb73e73e..4ae07da8f0b 100644
--- a/sys/arch/hp300/dev/dcm.c
+++ b/sys/arch/hp300/dev/dcm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dcm.c,v 1.31 2009/10/31 12:00:05 fgsch Exp $	*/
+/*	$OpenBSD: dcm.c,v 1.32 2009/11/09 17:53:38 nicm Exp $	*/
 /*	$NetBSD: dcm.c,v 1.41 1997/05/05 20:59:16 thorpej Exp $	*/
 
 /*
@@ -1177,7 +1177,6 @@ dcmstart(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) {
 #ifdef DCMSTATS
diff --git a/sys/arch/hppa/dev/pdc.c b/sys/arch/hppa/dev/pdc.c
index 9daed05a401..75f57be5c74 100644
--- a/sys/arch/hppa/dev/pdc.c
+++ b/sys/arch/hppa/dev/pdc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pdc.c,v 1.33 2009/10/31 12:00:05 fgsch Exp $	*/
+/*	$OpenBSD: pdc.c,v 1.34 2009/11/09 17:53:38 nicm Exp $	*/
 
 /*
  * Copyright (c) 1998-2003 Michael Shalayeff
@@ -345,7 +345,6 @@ pdcstart(tp)
 			wakeup((caddr_t)&tp->t_outq);
 		}
 		selwakeup(&tp->t_wsel);
-		KNOTE(&tp->t_wsel.si_note, 0);
 	}
 	tp->t_state |= TS_BUSY;
 	while (tp->t_outq.c_cc != 0)
diff --git a/sys/arch/hppa64/dev/pdc.c b/sys/arch/hppa64/dev/pdc.c
index 8c10c580742..14b4f006714 100644
--- a/sys/arch/hppa64/dev/pdc.c
+++ b/sys/arch/hppa64/dev/pdc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pdc.c,v 1.5 2009/10/31 12:00:05 fgsch Exp $	*/
+/*	$OpenBSD: pdc.c,v 1.6 2009/11/09 17:53:38 nicm Exp $	*/
 
 /*
  * Copyright (c) 2005 Michael Shalayeff
@@ -335,7 +335,6 @@ pdcstart(tp)
 			wakeup((caddr_t)&tp->t_outq);
 		}
 		selwakeup(&tp->t_wsel);
-		KNOTE(&tp->t_wsel.si_note, 0);
 	}
 	tp->t_state |= TS_BUSY;
 	while (tp->t_outq.c_cc != 0)
diff --git a/sys/arch/luna88k/dev/siotty.c b/sys/arch/luna88k/dev/siotty.c
index 7880b7f5466..c3d552d7059 100644
--- a/sys/arch/luna88k/dev/siotty.c
+++ b/sys/arch/luna88k/dev/siotty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: siotty.c,v 1.9 2009/10/31 12:00:05 fgsch Exp $ */
+/* $OpenBSD: siotty.c,v 1.10 2009/11/09 17:53:38 nicm Exp $ */
 /* $NetBSD: siotty.c,v 1.9 2002/03/17 19:40:43 atatat Exp $ */
 
 /*-
@@ -205,7 +205,6 @@ siostart(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 out;
diff --git a/sys/arch/mac68k/dev/z8530tty.c b/sys/arch/mac68k/dev/z8530tty.c
index aaeae9f1adf..08789011850 100644
--- a/sys/arch/mac68k/dev/z8530tty.c
+++ b/sys/arch/mac68k/dev/z8530tty.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: z8530tty.c,v 1.20 2009/10/31 12:00:05 fgsch Exp $	*/
+/*	$OpenBSD: z8530tty.c,v 1.21 2009/11/09 17:53:38 nicm Exp $	*/
 /*	$NetBSD: z8530tty.c,v 1.14 1996/12/17 20:42:43 gwr Exp $	*/
 
 /*
@@ -645,7 +645,6 @@ zsstart(tp)
 			wakeup((caddr_t)&tp->t_outq);
 		}
 		selwakeup(&tp->t_wsel);
-		KNOTE(&tp->t_wsel.si_note, 0);
 	}
 
 	nch = ndqb(&tp->t_outq, 0);	/* XXX */
diff --git a/sys/arch/macppc/dev/z8530tty.c b/sys/arch/macppc/dev/z8530tty.c
index ba510eed0ef..8df796549c0 100644
--- a/sys/arch/macppc/dev/z8530tty.c
+++ b/sys/arch/macppc/dev/z8530tty.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: z8530tty.c,v 1.10 2009/10/31 12:00:06 fgsch Exp $ */
+/*	$OpenBSD: z8530tty.c,v 1.11 2009/11/09 17:53:39 nicm Exp $ */
 /*	$NetBSD: z8530tty.c,v 1.13 1996/10/16 20:42:14 gwr Exp $	*/
 
 /*-
@@ -787,7 +787,6 @@ zsstart(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 out;
 	}
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);
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;
 	}
diff --git a/sys/arch/sh/dev/scif.c b/sys/arch/sh/dev/scif.c
index 942f5918d0a..12d13971470 100644
--- a/sys/arch/sh/dev/scif.c
+++ b/sys/arch/sh/dev/scif.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scif.c,v 1.9 2009/10/31 12:00:07 fgsch Exp $	*/
+/*	$OpenBSD: scif.c,v 1.10 2009/11/09 17:53:39 nicm Exp $	*/
 /*	$NetBSD: scif.c,v 1.47 2006/07/23 22:06:06 ad Exp $ */
 
 /*-
@@ -491,7 +491,6 @@ scifstart(struct tty *tp)
 			wakeup(&tp->t_outq);
 		}
 		selwakeup(&tp->t_wsel);
-		KNOTE(&tp->t_wsel.si_note, 0);
 		if (tp->t_outq.c_cc == 0)
 			goto out;
 	}
diff --git a/sys/arch/sparc/dev/magma.c b/sys/arch/sparc/dev/magma.c
index 2936c0a6c75..1390ed82200 100644
--- a/sys/arch/sparc/dev/magma.c
+++ b/sys/arch/sparc/dev/magma.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: magma.c,v 1.23 2009/10/31 12:00:07 fgsch Exp $	*/
+/*	$OpenBSD: magma.c,v 1.24 2009/11/09 17:53:39 nicm Exp $	*/
 
 /*-
  * Copyright (c) 1998 Iain Hibbert
@@ -1208,7 +1208,6 @@ mtty_start(tp)
 			}
 
 			selwakeup(&tp->t_wsel);
-			KNOTE(&tp->t_wsel.si_note, 0);
 		}
 
 		/*
diff --git a/sys/arch/sparc/dev/spif.c b/sys/arch/sparc/dev/spif.c
index bbbb914ef1d..c045e404d83 100644
--- a/sys/arch/sparc/dev/spif.c
+++ b/sys/arch/sparc/dev/spif.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: spif.c,v 1.23 2009/10/31 12:00:07 fgsch Exp $	*/
+/*	$OpenBSD: spif.c,v 1.24 2009/11/09 17:53:39 nicm Exp $	*/
 
 /*
  * Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -682,7 +682,6 @@ stty_start(tp)
 				wakeup(&tp->t_outq);
 			}
 			selwakeup(&tp->t_wsel);
-			KNOTE(&tp->t_wsel.si_note, 0);
 		}
 		if (tp->t_outq.c_cc) {
 			sp->sp_txc = ndqb(&tp->t_outq, 0);
diff --git a/sys/arch/sparc/dev/z8530tty.c b/sys/arch/sparc/dev/z8530tty.c
index e247826b368..9582081840f 100644
--- a/sys/arch/sparc/dev/z8530tty.c
+++ b/sys/arch/sparc/dev/z8530tty.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: z8530tty.c,v 1.12 2009/10/31 12:00:07 fgsch Exp $ */
+/*	$OpenBSD: z8530tty.c,v 1.13 2009/11/09 17:53:39 nicm Exp $ */
 /*	$NetBSD: z8530tty.c,v 1.13 1996/10/16 20:42:14 gwr Exp $	*/
 
 /*-
@@ -808,7 +808,6 @@ zsstart(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 out;
 	}
diff --git a/sys/arch/sparc64/dev/pcons.c b/sys/arch/sparc64/dev/pcons.c
index 293f35bd8c0..954b7833d1d 100644
--- a/sys/arch/sparc64/dev/pcons.c
+++ b/sys/arch/sparc64/dev/pcons.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcons.c,v 1.15 2009/10/31 06:40:16 deraadt Exp $	*/
+/*	$OpenBSD: pcons.c,v 1.16 2009/11/09 17:53:39 nicm Exp $	*/
 /*	$NetBSD: pcons.c,v 1.7 2001/05/02 10:32:20 scw Exp $	*/
 
 /*-
@@ -359,7 +359,6 @@ pconsstart(tp)
 			wakeup(cl);
 		}
 		selwakeup(&tp->t_wsel);
-		KNOTE(&tp->t_wsel.si_note, 0);
 	}
 	splx(s);
 }
diff --git a/sys/arch/sparc64/dev/sab.c b/sys/arch/sparc64/dev/sab.c
index 904cd1f1700..0c26fb2da42 100644
--- a/sys/arch/sparc64/dev/sab.c
+++ b/sys/arch/sparc64/dev/sab.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sab.c,v 1.26 2009/10/31 06:40:16 deraadt Exp $	*/
+/*	$OpenBSD: sab.c,v 1.27 2009/11/09 17:53:39 nicm Exp $	*/
 
 /*
  * Copyright (c) 2001 Jason L. Wright (jason@thought.net)
@@ -1099,7 +1099,6 @@ sabtty_start(tp)
 				wakeup(&tp->t_outq);
 			}
 			selwakeup(&tp->t_wsel);
-			KNOTE(&tp->t_wsel.si_note, 0);
 		}
 		if (tp->t_outq.c_cc) {
 			sc->sc_txc = ndqb(&tp->t_outq, 0);
diff --git a/sys/arch/sparc64/dev/sbbc.c b/sys/arch/sparc64/dev/sbbc.c
index 3ae379c3d21..ef0f070a57b 100644
--- a/sys/arch/sparc64/dev/sbbc.c
+++ b/sys/arch/sparc64/dev/sbbc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sbbc.c,v 1.6 2009/10/31 06:40:16 deraadt Exp $	*/
+/*	$OpenBSD: sbbc.c,v 1.7 2009/11/09 17:53:39 nicm Exp $	*/
 /*
  * Copyright (c) 2008 Mark Kettenis
  *
@@ -629,7 +629,6 @@ sbbcstart(struct tty *tp)
 			wakeup((caddr_t)&tp->t_outq);
 		}
 		selwakeup(&tp->t_wsel);
-		KNOTE(&tp->t_wsel.si_note, 0);
 	}
 	tp->t_state |= TS_BUSY;
 	while (tp->t_outq.c_cc != 0)
diff --git a/sys/arch/sparc64/dev/vcctty.c b/sys/arch/sparc64/dev/vcctty.c
index 5c59a33c530..f43c66f436d 100644
--- a/sys/arch/sparc64/dev/vcctty.c
+++ b/sys/arch/sparc64/dev/vcctty.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vcctty.c,v 1.2 2009/10/31 06:40:16 deraadt Exp $	*/
+/*	$OpenBSD: vcctty.c,v 1.3 2009/11/09 17:53:39 nicm Exp $	*/
 /*
  * Copyright (c) 2009 Mark Kettenis
  *
@@ -440,7 +440,6 @@ vccttystart(struct tty *tp)
 			wakeup((caddr_t)&tp->t_outq);
 		}
 		selwakeup(&tp->t_wsel);
-		KNOTE(&tp->t_wsel.si_note, 0);
 	}
 	tp->t_state |= TS_BUSY;
 	while (tp->t_outq.c_cc != 0)
diff --git a/sys/arch/sparc64/dev/vcons.c b/sys/arch/sparc64/dev/vcons.c
index a1daee4977c..f6fefcfd89d 100644
--- a/sys/arch/sparc64/dev/vcons.c
+++ b/sys/arch/sparc64/dev/vcons.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vcons.c,v 1.6 2009/10/31 06:40:16 deraadt Exp $	*/
+/*	$OpenBSD: vcons.c,v 1.7 2009/11/09 17:53:39 nicm Exp $	*/
 /*
  * Copyright (c) 2008 Mark Kettenis
  *
@@ -280,7 +280,6 @@ vconsstart(struct tty *tp)
 			wakeup((caddr_t)&tp->t_outq);
 		}
 		selwakeup(&tp->t_wsel);
-		KNOTE(&tp->t_wsel.si_note, 0);
 	}
 	tp->t_state |= TS_BUSY;
 	while (tp->t_outq.c_cc != 0)
diff --git a/sys/arch/sparc64/dev/z8530tty.c b/sys/arch/sparc64/dev/z8530tty.c
index bb64f14c480..43a98f675da 100644
--- a/sys/arch/sparc64/dev/z8530tty.c
+++ b/sys/arch/sparc64/dev/z8530tty.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: z8530tty.c,v 1.17 2009/10/31 12:00:07 fgsch Exp $	*/
+/*	$OpenBSD: z8530tty.c,v 1.18 2009/11/09 17:53:39 nicm Exp $	*/
 /*	$NetBSD: z8530tty.c,v 1.77 2001/05/30 15:24:24 lukem Exp $	*/
 
 /*-
@@ -776,7 +776,6 @@ zsstart(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 out;
 	}
diff --git a/sys/arch/vax/qbus/dhu.c b/sys/arch/vax/qbus/dhu.c
index afa56c64ae6..378c1a7f757 100644
--- a/sys/arch/vax/qbus/dhu.c
+++ b/sys/arch/vax/qbus/dhu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dhu.c,v 1.14 2009/10/31 12:00:07 fgsch Exp $	*/
+/*	$OpenBSD: dhu.c,v 1.15 2009/11/09 17:53:39 nicm Exp $	*/
 /*	$NetBSD: dhu.c,v 1.19 2000/06/04 06:17:01 matt Exp $	*/
 /*
  * Copyright (c) 2003, Hugh Graham.
@@ -645,7 +645,6 @@ dhustart(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 out;
diff --git a/sys/arch/vax/qbus/dl.c b/sys/arch/vax/qbus/dl.c
index 32b1eeff260..7a863891222 100644
--- a/sys/arch/vax/qbus/dl.c
+++ b/sys/arch/vax/qbus/dl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dl.c,v 1.8 2009/10/31 12:00:07 fgsch Exp $	*/
+/*	$OpenBSD: dl.c,v 1.9 2009/11/09 17:53:39 nicm Exp $	*/
 /*	$NetBSD: dl.c,v 1.11 2000/01/24 02:40:29 matt Exp $	*/
 
 /*-
@@ -464,7 +464,6 @@ dlstart(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 out;
diff --git a/sys/arch/vax/qbus/dz.c b/sys/arch/vax/qbus/dz.c
index 25afdf55945..ff604e6d7f3 100644
--- a/sys/arch/vax/qbus/dz.c
+++ b/sys/arch/vax/qbus/dz.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dz.c,v 1.19 2009/10/31 12:00:07 fgsch Exp $	*/
+/*	$OpenBSD: dz.c,v 1.20 2009/11/09 17:53:39 nicm Exp $	*/
 /*	$NetBSD: dz.c,v 1.23 2000/06/04 02:14:12 matt Exp $	*/
 /*
  * Copyright (c) 1996  Ken C. Wellsch.  All rights reserved.
@@ -480,7 +480,6 @@ dzstart(struct tty *tp)
 			wakeup((caddr_t)cl);
 		}
 		selwakeup(&tp->t_wsel);
-		KNOTE(&tp->t_wsel.si_note, 0);
 	}
 	if (cl->c_cc == 0) {
 		splx(s);
diff --git a/sys/arch/vax/qbus/qd.c b/sys/arch/vax/qbus/qd.c
index 0a452e5099b..77f05952695 100644
--- a/sys/arch/vax/qbus/qd.c
+++ b/sys/arch/vax/qbus/qd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qd.c,v 1.15 2009/10/31 06:40:16 deraadt Exp $	*/
+/*	$OpenBSD: qd.c,v 1.16 2009/11/09 17:53:39 nicm Exp $	*/
 /*	$NetBSD: qd.c,v 1.17 2000/01/24 02:40:29 matt Exp $	*/
 
 /*-
@@ -2065,7 +2065,6 @@ qddint(arg)
 
 		if (qdrsel[dv->dv_unit].si_pid && qdflags[dv->dv_unit].selmask & SEL_WRITE) {
 			selwakeup(&qdrsel[dv->dv_unit]);
-			KNOTE(&qdrsel[dv->dv_unit].si_note, 0);
 			qdrsel[dv->dv_unit].si_pid = 0;
 			qdflags[dv->dv_unit].selmask &= ~SEL_WRITE;
 		}
@@ -2085,7 +2084,6 @@ qddint(arg)
 	if (DMA_ISFULL(header)) {
 		if (qdrsel[dv->dv_unit].si_pid && qdflags[dv->dv_unit].selmask & SEL_WRITE) {
 			selwakeup(&qdrsel[dv->dv_unit]);
-			KNOTE(&qdrsel[dv->dv_unit].si_note, 0);
 			qdrsel[dv->dv_unit].si_pid = 0;  
 			qdflags[dv->dv_unit].selmask &= ~SEL_WRITE;
 		}
@@ -2106,7 +2104,6 @@ qddint(arg)
 	if (DMA_ISEMPTY(header)) {
 		if (qdrsel[dv->dv_unit].si_pid && qdflags[dv->dv_unit].selmask & SEL_WRITE) {
 			selwakeup(&qdrsel[dv->dv_unit]);
-			KNOTE(&qdrsel[dv->dv_unit].si_note, 0);
 			qdrsel[dv->dv_unit].si_pid = 0;
 			qdflags[dv->dv_unit].selmask &= ~SEL_WRITE;
 		}
@@ -2740,7 +2737,6 @@ GET_TBUTTON:
 		*/
 		if (qdrsel[dv->dv_unit].si_pid && do_wakeup && qdflags[dv->dv_unit].selmask & SEL_READ) {
 			selwakeup(&qdrsel[dv->dv_unit]);
-			KNOTE(&qdrsel[dv->dv_unit].si_note, 0);
 			qdrsel[dv->dv_unit].si_pid = 0;
 			qdflags[dv->dv_unit].selmask &= ~SEL_READ;
 			do_wakeup = 0;
diff --git a/sys/arch/vax/vax/gencons.c b/sys/arch/vax/vax/gencons.c
index 16406236692..d60fbd6f45e 100644
--- a/sys/arch/vax/vax/gencons.c
+++ b/sys/arch/vax/vax/gencons.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gencons.c,v 1.20 2009/10/31 12:00:07 fgsch Exp $	*/
+/*	$OpenBSD: gencons.c,v 1.21 2009/11/09 17:53:39 nicm Exp $	*/
 /*	$NetBSD: gencons.c,v 1.22 2000/01/24 02:40:33 matt Exp $	*/
 
 /*
@@ -192,7 +192,6 @@ gencnstart(struct tty *tp)
 			wakeup((caddr_t)cl);
 		}
 		selwakeup(&tp->t_wsel);
-		KNOTE(&tp->t_wsel.si_note, 0);
 	}
 
 out:	splx(s);
diff --git a/sys/arch/vax/vxt/qsc.c b/sys/arch/vax/vxt/qsc.c
index 4ee20efa57b..491eb43fc17 100644
--- a/sys/arch/vax/vxt/qsc.c
+++ b/sys/arch/vax/vxt/qsc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qsc.c,v 1.4 2009/10/31 12:00:07 fgsch Exp $	*/
+/*	$OpenBSD: qsc.c,v 1.5 2009/11/09 17:53:39 nicm Exp $	*/
 /*
  * Copyright (c) 2006 Miodrag Vallat.
  *
@@ -351,7 +351,6 @@ qscstart(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;
 	}