From 9473d5ca6183970c256efe065773dda18e76cac4 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicm@cvs.openbsd.org>
Date: Mon, 9 Nov 2009 17:53:40 +0000
Subject: 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
---
 sys/dev/rnd.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'sys/dev/rnd.c')

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);
-- 
cgit v1.2.3