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/dev/ic | |
| 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/dev/ic')
| -rw-r--r-- | sys/dev/ic/com.c | 3 | ||||
| -rw-r--r-- | sys/dev/ic/cy.c | 3 | ||||
| -rw-r--r-- | sys/dev/ic/z8530tty.c | 3 |
3 files changed, 3 insertions, 6 deletions
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 */ |