diff options
Diffstat (limited to 'sys')
63 files changed, 71 insertions, 144 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; } diff --git a/sys/dev/audio.c b/sys/dev/audio.c index 6dd0f35a685..e3244dc6997 100644 --- a/sys/dev/audio.c +++ b/sys/dev/audio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: audio.c,v 1.106 2009/10/27 12:13:33 jakemsr Exp $ */ +/* $OpenBSD: audio.c,v 1.107 2009/11/09 17:53:39 nicm Exp $ */ /* $NetBSD: audio.c,v 1.119 1999/11/09 16:50:47 augustss Exp $ */ /* @@ -1764,7 +1764,6 @@ audio_selwakeup(struct audio_softc *sc, int play) selwakeup(si); if (sc->sc_async_audio) psignal(sc->sc_async_audio, SIGIO); - KNOTE(&si->si_note, 0); } #define AUDIO_FILTREAD(sc) ( \ diff --git a/sys/dev/hotplug.c b/sys/dev/hotplug.c index c2bfbfe8234..d8f589bb280 100644 --- a/sys/dev/hotplug.c +++ b/sys/dev/hotplug.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hotplug.c,v 1.8 2006/05/28 16:43:49 mk Exp $ */ +/* $OpenBSD: hotplug.c,v 1.9 2009/11/09 17:53:39 nicm Exp $ */ /* * Copyright (c) 2004 Alexander Yurchenko <grange@openbsd.org> * @@ -97,7 +97,6 @@ hotplug_put_event(struct hotplug_event *he) evqueue_count++; wakeup(&evqueue); selwakeup(&hotplug_sel); - KNOTE(&hotplug_sel.si_note, 0); return (0); } diff --git a/sys/dev/ic/com.c b/sys/dev/ic/com.c index 2af5e0306f4..fb06e1360a0 100644 --- a/sys/dev/ic/com.c +++ b/sys/dev/ic/com.c @@ -1,4 +1,4 @@ -/* $OpenBSD: com.c,v 1.136 2009/11/04 19:14:10 kettenis Exp $ */ +/* $OpenBSD: com.c,v 1.137 2009/11/09 17:53:39 nicm Exp $ */ /* $NetBSD: com.c,v 1.82.4.1 1996/06/02 09:08:00 mrg Exp $ */ /* @@ -889,7 +889,6 @@ comstart(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 stopped; } diff --git a/sys/dev/ic/cy.c b/sys/dev/ic/cy.c index f4d331fae48..bcf7f43023b 100644 --- a/sys/dev/ic/cy.c +++ b/sys/dev/ic/cy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cy.c,v 1.27 2009/10/31 12:00:07 fgsch Exp $ */ +/* $OpenBSD: cy.c,v 1.28 2009/11/09 17:53:39 nicm Exp $ */ /* * Copyright (c) 1996 Timo Rossi. * All rights reserved. @@ -629,7 +629,6 @@ cystart(tp) } selwakeup(&tp->t_wsel); - KNOTE(&tp->t_wsel.si_note, 0); if (tp->t_outq.c_cc == 0) goto out; diff --git a/sys/dev/ic/z8530tty.c b/sys/dev/ic/z8530tty.c index e2fbb2e9480..f8c9f388b51 100644 --- a/sys/dev/ic/z8530tty.c +++ b/sys/dev/ic/z8530tty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: z8530tty.c,v 1.19 2009/10/31 12:00:08 fgsch Exp $ */ +/* $OpenBSD: z8530tty.c,v 1.20 2009/11/09 17:53:39 nicm Exp $ */ /* $NetBSD: z8530tty.c,v 1.13 1996/10/16 20:42:14 gwr Exp $ */ /* @@ -606,7 +606,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/dev/midi.c b/sys/dev/midi.c index 53e2aef6062..64b41efc205 100644 --- a/sys/dev/midi.c +++ b/sys/dev/midi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: midi.c,v 1.20 2009/11/01 20:14:12 nicm Exp $ */ +/* $OpenBSD: midi.c,v 1.21 2009/11/09 17:53:39 nicm Exp $ */ /* * Copyright (c) 2003, 2004 Alexandre Ratchov @@ -124,7 +124,6 @@ midi_iintr(void *addr, int data) wakeup(&sc->rchan); } selwakeup(&sc->rsel); - KNOTE(&sc->rsel.si_note, 0); if (sc->async) psignal(sc->async, SIGIO); } @@ -224,7 +223,6 @@ midi_out_stop(struct midi_softc *sc) wakeup(&sc->wchan); } selwakeup(&sc->wsel); - KNOTE(&sc->wsel.si_note, 0); if (sc->async) psignal(sc->async, SIGIO); } diff --git a/sys/dev/pci/bktr/bktr_core.c b/sys/dev/pci/bktr/bktr_core.c index a4cde5e1ea9..11c5da0b264 100644 --- a/sys/dev/pci/bktr/bktr_core.c +++ b/sys/dev/pci/bktr/bktr_core.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bktr_core.c,v 1.27 2009/10/31 06:40:17 deraadt Exp $ */ +/* $OpenBSD: bktr_core.c,v 1.28 2009/11/09 17:53:39 nicm Exp $ */ /* $FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.114 2000/10/31 13:09:56 roger Exp $ */ /* @@ -653,12 +653,11 @@ common_bktr_intr( void *arg ) /* If someone has a select() on /dev/vbi, inform them */ #ifndef __OpenBSD__ if (bktr->vbi_select.si_pid) { -#else - if (bktr->vbi_select.si_selpid) { -#endif selwakeup(&bktr->vbi_select); - KNOTE(&bktr->vbi_select.si_note, 0); } +#else + selwakeup(&bktr->vbi_select); +#endif } diff --git a/sys/dev/pci/cz.c b/sys/dev/pci/cz.c index ae1bb2312eb..0f1377f3e7d 100644 --- a/sys/dev/pci/cz.c +++ b/sys/dev/pci/cz.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cz.c,v 1.14 2009/11/02 00:58:22 fgsch Exp $ */ +/* $OpenBSD: cz.c,v 1.15 2009/11/09 17:53:39 nicm Exp $ */ /* $NetBSD: cz.c,v 1.15 2001/01/20 19:10:36 thorpej Exp $ */ /*- @@ -1486,7 +1486,6 @@ czttystart(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/dev/rnd.c b/sys/dev/rnd.c index 0443af856ed..25c8e8ff9fc 100644 --- a/sys/dev/rnd.c +++ b/sys/dev/rnd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rnd.c,v 1.100 2009/06/05 04:43:23 guenther Exp $ */ +/* $OpenBSD: rnd.c,v 1.101 2009/11/09 17:53:39 nicm Exp $ */ /* * rnd.c -- A strong random number generator @@ -732,7 +732,6 @@ dequeue_randomness(void *v) rs->asleep--; wakeup((void *)&rs->asleep); selwakeup(&rnd_rsel); - KNOTE(&rnd_rsel.si_note, 0); } mtx_enter(&rndlock); diff --git a/sys/dev/sbus/magma.c b/sys/dev/sbus/magma.c index 50336f51d09..8a3a6ba7978 100644 --- a/sys/dev/sbus/magma.c +++ b/sys/dev/sbus/magma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: magma.c,v 1.19 2009/10/31 12:00:08 fgsch Exp $ */ +/* $OpenBSD: magma.c,v 1.20 2009/11/09 17:53:39 nicm Exp $ */ /*- * Copyright (c) 1998 Iain Hibbert @@ -1123,7 +1123,6 @@ mtty_start(struct tty *tp) } selwakeup(&tp->t_wsel); - KNOTE(&tp->t_wsel.si_note, 0); } /* if something to send, start transmitting diff --git a/sys/dev/sbus/spif.c b/sys/dev/sbus/spif.c index 8a90e089025..df189627d1d 100644 --- a/sys/dev/sbus/spif.c +++ b/sys/dev/sbus/spif.c @@ -1,4 +1,4 @@ -/* $OpenBSD: spif.c,v 1.15 2009/10/31 12:00:08 fgsch Exp $ */ +/* $OpenBSD: spif.c,v 1.16 2009/11/09 17:53:39 nicm Exp $ */ /* * Copyright (c) 1999-2002 Jason L. Wright (jason@thought.net) @@ -746,7 +746,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/dev/sequencer.c b/sys/dev/sequencer.c index 018bc9e6b46..98bfe88c565 100644 --- a/sys/dev/sequencer.c +++ b/sys/dev/sequencer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sequencer.c,v 1.18 2009/11/01 20:14:12 nicm Exp $ */ +/* $OpenBSD: sequencer.c,v 1.19 2009/11/09 17:53:39 nicm Exp $ */ /* $NetBSD: sequencer.c,v 1.13 1998/11/25 22:17:07 augustss Exp $ */ /* @@ -266,7 +266,6 @@ seq_timeout(void *addr) if (SEQ_QLEN(&sc->outq) < sc->lowat) { seq_wakeup(&sc->wchan); selwakeup(&sc->wsel); - KNOTE(&sc->wsel.si_note, 0); if (sc->async) psignal(sc->async, SIGIO); } @@ -324,7 +323,6 @@ seq_input_event(struct sequencer_softc *sc, seq_event_rec *cmd) SEQ_QPUT(q, *cmd); seq_wakeup(&sc->rchan); selwakeup(&sc->rsel); - KNOTE(&sc->rsel.si_note, 0); if (sc->async) psignal(sc->async, SIGIO); return (0); diff --git a/sys/dev/systrace.c b/sys/dev/systrace.c index f3ede4462d1..72db52f030f 100644 --- a/sys/dev/systrace.c +++ b/sys/dev/systrace.c @@ -1,4 +1,4 @@ -/* $OpenBSD: systrace.c,v 1.51 2009/10/31 06:40:16 deraadt Exp $ */ +/* $OpenBSD: systrace.c,v 1.52 2009/11/09 17:53:39 nicm Exp $ */ /* * Copyright 2002 Niels Provos <provos@citi.umich.edu> * All rights reserved. @@ -609,7 +609,6 @@ systrace_wakeup(struct fsystrace *fst) { wakeup((caddr_t)fst); selwakeup(&fst->si); - KNOTE(&fst->si.si_note, 0); } struct proc * diff --git a/sys/dev/usb/ucom.c b/sys/dev/usb/ucom.c index 41581e084fa..f073c97b661 100644 --- a/sys/dev/usb/ucom.c +++ b/sys/dev/usb/ucom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ucom.c,v 1.45 2009/10/31 12:00:08 fgsch Exp $ */ +/* $OpenBSD: ucom.c,v 1.46 2009/11/09 17:53:39 nicm Exp $ */ /* $NetBSD: ucom.c,v 1.49 2003/01/01 00:10:25 thorpej Exp $ */ /* @@ -949,7 +949,6 @@ ucomstart(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/dev/usb/ugen.c b/sys/dev/usb/ugen.c index c90c58dcc5a..ec32cf2bf9d 100644 --- a/sys/dev/usb/ugen.c +++ b/sys/dev/usb/ugen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ugen.c,v 1.60 2009/10/31 06:40:17 deraadt Exp $ */ +/* $OpenBSD: ugen.c,v 1.61 2009/11/09 17:53:39 nicm Exp $ */ /* $NetBSD: ugen.c,v 1.63 2002/11/26 18:49:48 christos Exp $ */ /* $FreeBSD: src/sys/dev/usb/ugen.c,v 1.26 1999/11/17 22:33:41 n_hibma Exp $ */ @@ -822,7 +822,6 @@ ugenintr(usbd_xfer_handle xfer, usbd_private_handle addr, usbd_status status) wakeup(sce); } selwakeup(&sce->rsel); - KNOTE(&sce->rsel.si_note, 0); } void @@ -882,7 +881,6 @@ ugen_isoc_rintr(usbd_xfer_handle xfer, usbd_private_handle addr, wakeup(sce); } selwakeup(&sce->rsel); - KNOTE(&sce->rsel.si_note, 0); } usbd_status diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c index 76e0dda1246..f8eb2ad90e5 100644 --- a/sys/dev/usb/uhid.c +++ b/sys/dev/usb/uhid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uhid.c,v 1.45 2009/10/31 06:40:17 deraadt Exp $ */ +/* $OpenBSD: uhid.c,v 1.46 2009/11/09 17:53:39 nicm Exp $ */ /* $NetBSD: uhid.c,v 1.57 2003/03/11 16:44:00 augustss Exp $ */ /* @@ -234,7 +234,6 @@ uhid_intr(struct uhidev *addr, void *data, u_int len) wakeup(&sc->sc_q); } selwakeup(&sc->sc_rsel); - KNOTE(&sc->sc_rsel.si_note, 0); if (sc->sc_async != NULL) { DPRINTFN(3, ("uhid_intr: sending SIGIO %p\n", sc->sc_async)); psignal(sc->sc_async, SIGIO); diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c index 63b17a494f4..21a8a07fbef 100644 --- a/sys/dev/usb/usb.c +++ b/sys/dev/usb/usb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: usb.c,v 1.61 2009/11/04 19:14:10 kettenis Exp $ */ +/* $OpenBSD: usb.c,v 1.62 2009/11/09 17:53:39 nicm Exp $ */ /* $NetBSD: usb.c,v 1.77 2003/01/01 00:10:26 thorpej Exp $ */ /* @@ -768,7 +768,6 @@ usb_add_event(int type, struct usb_event *uep) SIMPLEQ_INSERT_TAIL(&usb_events, ueq, next); wakeup(&usb_events); selwakeup(&usb_selevent); - KNOTE(&usb_selevent.si_note, 0); if (usb_async_proc != NULL) psignal(usb_async_proc, SIGIO); splx(s); diff --git a/sys/dev/vscsi.c b/sys/dev/vscsi.c index e062d211e2a..2937475ae32 100644 --- a/sys/dev/vscsi.c +++ b/sys/dev/vscsi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vscsi.c,v 1.3 2009/08/13 19:51:49 dlg Exp $ */ +/* $OpenBSD: vscsi.c,v 1.4 2009/11/09 17:53:39 nicm Exp $ */ /* * Copyright (c) 2008 David Gwynne <dlg@openbsd.org> @@ -194,7 +194,6 @@ vscsi_cmd(struct scsi_xfer *xs) mtx_leave(&sc->sc_ccb_mtx); selwakeup(&sc->sc_sel); - KNOTE(&sc->sc_sel.si_note, 0); if (polled) { rw_enter_read(&sc->sc_ccb_polling); 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)); \ diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 4295a8cda84..bb196052f9a 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_event.c,v 1.34 2009/06/02 11:04:55 guenther Exp $ */ +/* $OpenBSD: kern_event.c,v 1.35 2009/11/09 17:53:39 nicm Exp $ */ /*- * Copyright (c) 1999,2000,2001 Jonathan Lemon <jlemon@FreeBSD.org> @@ -865,8 +865,8 @@ kqueue_wakeup(struct kqueue *kq) if (kq->kq_state & KQ_SEL) { kq->kq_state &= ~KQ_SEL; selwakeup(&kq->kq_sel); - } - KNOTE(&kq->kq_sel.si_note, 0); + } else + KNOTE(&kq->kq_sel.si_note, 0); } /* diff --git a/sys/kern/subr_log.c b/sys/kern/subr_log.c index a1ba8e2335b..01550138f57 100644 --- a/sys/kern/subr_log.c +++ b/sys/kern/subr_log.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_log.c,v 1.15 2007/09/03 17:51:03 thib Exp $ */ +/* $OpenBSD: subr_log.c,v 1.16 2009/11/09 17:53:39 nicm Exp $ */ /* $NetBSD: subr_log.c,v 1.11 1996/03/30 22:24:44 christos Exp $ */ /* @@ -263,7 +263,6 @@ logwakeup(void) wakeup(msgbufp); logsoftc.sc_state &= ~LOG_RDWAIT; } - KNOTE(&logsoftc.sc_selp.si_note, 0); } /*ARGSUSED*/ diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c index 93f1ebed199..70e3ac8c8cc 100644 --- a/sys/kern/sys_generic.c +++ b/sys/kern/sys_generic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sys_generic.c,v 1.66 2009/06/08 23:18:42 deraadt Exp $ */ +/* $OpenBSD: sys_generic.c,v 1.67 2009/11/09 17:53:39 nicm Exp $ */ /* $NetBSD: sys_generic.c,v 1.24 1996/03/29 00:25:32 cgd Exp $ */ /* @@ -708,6 +708,7 @@ selwakeup(struct selinfo *sip) struct proc *p; int s; + KNOTE(&sip->si_note, 0); if (sip->si_selpid == 0) return; if (sip->si_flags & SI_COLL) { diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c index 3ca2f34e885..d93ec33b31c 100644 --- a/sys/kern/sys_pipe.c +++ b/sys/kern/sys_pipe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sys_pipe.c,v 1.56 2009/10/30 18:03:34 deraadt Exp $ */ +/* $OpenBSD: sys_pipe.c,v 1.57 2009/11/09 17:53:39 nicm Exp $ */ /* * Copyright (c) 1996 John S. Dyson @@ -255,10 +255,10 @@ pipeselwakeup(struct pipe *cpipe) if (cpipe->pipe_state & PIPE_SEL) { cpipe->pipe_state &= ~PIPE_SEL; selwakeup(&cpipe->pipe_sel); - } + } else + KNOTE(&cpipe->pipe_sel.si_note, 0); if ((cpipe->pipe_state & PIPE_ASYNC) && cpipe->pipe_pgid != NO_PID) gsignal(cpipe->pipe_pgid, SIGIO); - KNOTE(&cpipe->pipe_sel.si_note, 0); } /* ARGSUSED */ diff --git a/sys/kern/tty.c b/sys/kern/tty.c index e71dd941f9f..35ca4909e05 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty.c,v 1.82 2009/10/30 16:41:10 nicm Exp $ */ +/* $OpenBSD: tty.c,v 1.83 2009/11/09 17:53:39 nicm Exp $ */ /* $NetBSD: tty.c,v 1.68.4.2 1996/06/06 16:04:52 thorpej Exp $ */ /*- @@ -1246,7 +1246,6 @@ ttyflush(struct tty *tp, int rw) FLUSHQ(&tp->t_outq); wakeup((caddr_t)&tp->t_outq); selwakeup(&tp->t_wsel); - KNOTE(&tp->t_wsel.si_note, 0); } splx(s); } @@ -2021,7 +2020,6 @@ ttwakeup(struct tty *tp) if (ISSET(tp->t_state, TS_ASYNC)) pgsignal(tp->t_pgrp, SIGIO, 1); wakeup((caddr_t)&tp->t_rawq); - KNOTE(&tp->t_rsel.si_note, 0); } /* diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c index 0d727c550eb..793574c36b3 100644 --- a/sys/kern/tty_pty.c +++ b/sys/kern/tty_pty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty_pty.c,v 1.42 2009/10/31 12:00:08 fgsch Exp $ */ +/* $OpenBSD: tty_pty.c,v 1.43 2009/11/09 17:53:39 nicm Exp $ */ /* $NetBSD: tty_pty.c,v 1.33.4.1 1996/06/02 09:08:11 mrg Exp $ */ /* @@ -395,12 +395,10 @@ ptcwakeup(struct tty *tp, int flag) if (flag & FREAD) { selwakeup(&pti->pt_selr); wakeup(&tp->t_outq.c_cf); - KNOTE(&pti->pt_selr.si_note, 0); } if (flag & FWRITE) { selwakeup(&pti->pt_selw); wakeup(&tp->t_rawq.c_cf); - KNOTE(&pti->pt_selw.si_note, 0); } } @@ -510,7 +508,6 @@ ptcread(dev_t dev, struct uio *uio, int flag) wakeup(&tp->t_outq); } selwakeup(&tp->t_wsel); - KNOTE(&tp->t_wsel.si_note, 0); } if (bufcc) bzero(buf, bufcc); diff --git a/sys/kern/uipc_socket2.c b/sys/kern/uipc_socket2.c index bb53e2cc12d..45c335f8236 100644 --- a/sys/kern/uipc_socket2.c +++ b/sys/kern/uipc_socket2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_socket2.c,v 1.49 2009/08/10 16:49:39 thib Exp $ */ +/* $OpenBSD: uipc_socket2.c,v 1.50 2009/11/09 17:53:39 nicm Exp $ */ /* $NetBSD: uipc_socket2.c,v 1.11 1996/02/04 02:17:55 christos Exp $ */ /* @@ -318,7 +318,6 @@ sowakeup(struct socket *so, struct sockbuf *sb) } if (so->so_state & SS_ASYNC) csignal(so->so_pgid, SIGIO, so->so_siguid, so->so_sigeuid); - KNOTE(&sb->sb_sel.si_note, 0); } /* diff --git a/sys/net/bpf.c b/sys/net/bpf.c index 55e85a106c0..76e251c0ca5 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bpf.c,v 1.74 2009/10/26 18:22:58 claudio Exp $ */ +/* $OpenBSD: bpf.c,v 1.75 2009/11/09 17:53:39 nicm Exp $ */ /* $NetBSD: bpf.c,v 1.33 1997/02/21 23:59:35 thorpej Exp $ */ /* @@ -506,7 +506,6 @@ bpf_wakeup(struct bpf_d *d) selwakeup(&d->bd_sel); /* XXX */ d->bd_sel.si_selpid = 0; - KNOTE(&d->bd_sel.si_note, 0); } int diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c index ad5507edf6f..3debfa9b667 100644 --- a/sys/net/if_tun.c +++ b/sys/net/if_tun.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_tun.c,v 1.99 2009/08/09 10:09:12 claudio Exp $ */ +/* $OpenBSD: if_tun.c,v 1.100 2009/11/09 17:53:39 nicm Exp $ */ /* $NetBSD: if_tun.c,v 1.24 1996/05/07 02:40:48 thorpej Exp $ */ /* @@ -412,7 +412,6 @@ tunclose(dev_t dev, int flag, int mode, struct proc *p) else { tp->tun_pgid = 0; selwakeup(&tp->tun_rsel); - KNOTE(&tp->tun_rsel.si_note, 0); } return (0); @@ -642,7 +641,6 @@ tun_wakeup(struct tun_softc *tp) csignal(tp->tun_pgid, SIGIO, tp->tun_siguid, tp->tun_sigeuid); selwakeup(&tp->tun_rsel); - KNOTE(&tp->tun_rsel.si_note, 0); } /* |