diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2009-11-09 17:53:40 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2009-11-09 17:53:40 +0000 |
| commit | 9473d5ca6183970c256efe065773dda18e76cac4 (patch) | |
| tree | c9ec3b4b0898967b165f4e25400b8686f69727b1 /sys/arch/alpha | |
| parent | 8314ec33d28a7808b9db09541a81f1ac0496c799 (diff) | |
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
Diffstat (limited to 'sys/arch/alpha')
| -rw-r--r-- | sys/arch/alpha/alpha/promcons.c | 3 | ||||
| -rw-r--r-- | sys/arch/alpha/tc/scc.c | 4 |
2 files changed, 2 insertions, 5 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; } |