diff options
author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-10-31 06:40:18 +0000 |
---|---|---|
committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-10-31 06:40:18 +0000 |
commit | f3184ac14f03da17bde002ccff8abf43076b34bc (patch) | |
tree | 095aba03ec9c46097cdee71ffbe0a3cf6726ded1 /sys/arch/mvme88k/dev | |
parent | 84fb3053dd046225edb7868a8dd17410070e5b8c (diff) |
Add missing KNOTE() calls after selwakeup(), until we decide if the KNOTE()
calls can go directly into selwakeup() safely
long discussion with nicm, murmers of consent from tedu and miod, noone
else seems to care of kqueue is busted as long as it makes their sockets
move data fast... pretty sad.
Diffstat (limited to 'sys/arch/mvme88k/dev')
-rw-r--r-- | sys/arch/mvme88k/dev/cl.c | 4 | ||||
-rw-r--r-- | sys/arch/mvme88k/dev/dart.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/sys/arch/mvme88k/dev/cl.c b/sys/arch/mvme88k/dev/cl.c index e5b3b2a568a..5b7a1c0adc0 100644 --- a/sys/arch/mvme88k/dev/cl.c +++ b/sys/arch/mvme88k/dev/cl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cl.c,v 1.54 2009/05/31 12:25:53 miod Exp $ */ +/* $OpenBSD: cl.c,v 1.55 2009/10/31 06:40:16 deraadt Exp $ */ /* * Copyright (c) 1995 Dale Rahn. All rights reserved. @@ -1426,6 +1426,7 @@ 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); @@ -1457,6 +1458,7 @@ 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 f96fd2f9878..32a3f6e3d42 100644 --- a/sys/arch/mvme88k/dev/dart.c +++ b/sys/arch/mvme88k/dev/dart.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dart.c,v 1.51 2008/01/23 16:37:57 jsing Exp $ */ +/* $OpenBSD: dart.c,v 1.52 2009/10/31 06:40:16 deraadt Exp $ */ /* * Mach Operating System @@ -312,6 +312,7 @@ 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; } |