From d0d519348da5646dd0a77d1551596049d3d1a6a6 Mon Sep 17 00:00:00 2001
From: Mark Murray <markm@FreeBSD.org>
Date: Tue, 12 Sep 2000 13:13:22 +0000
Subject: [PATCH] The "struct proc" argument to read_random was ill-conceived,
 and a hangover from previous experimentation. Remove it. This will clean up
 gratuitous needs for forward references and other namespace pollution. Moaned
 about by:	bde Brought to my attention by:	bp

---
 sys/dev/random/randomdev.c    | 2 +-
 sys/dev/random/yarrow.c       | 2 +-
 sys/dev/randomdev/randomdev.c | 2 +-
 sys/dev/randomdev/yarrow.c    | 2 +-
 sys/sys/random.h              | 4 +---
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/sys/dev/random/randomdev.c b/sys/dev/random/randomdev.c
index aba955ff5bdb..d5730c4bf766 100644
--- a/sys/dev/random/randomdev.c
+++ b/sys/dev/random/randomdev.c
@@ -109,7 +109,7 @@ random_read(dev_t dev, struct uio *uio, int flag)
 	c = min(uio->uio_resid, PAGE_SIZE);
 	random_buf = (void *)malloc(c, M_TEMP, M_WAITOK);
 	while (uio->uio_resid > 0 && error == 0) {
-		ret = read_random(uio->uio_procp, random_buf, c);
+		ret = read_random(random_buf, c);
 		error = uiomove(random_buf, ret, uio);
 	}
 	free(random_buf, M_TEMP);
diff --git a/sys/dev/random/yarrow.c b/sys/dev/random/yarrow.c
index df34f659e8e4..76ae515974d2 100644
--- a/sys/dev/random/yarrow.c
+++ b/sys/dev/random/yarrow.c
@@ -369,7 +369,7 @@ reseed(int fastslow)
 }
 
 u_int
-read_random(struct proc *proc, void *buf, u_int count)
+read_random(void *buf, u_int count)
 {
 	static u_int64_t genval;
 	static int cur = 0;
diff --git a/sys/dev/randomdev/randomdev.c b/sys/dev/randomdev/randomdev.c
index aba955ff5bdb..d5730c4bf766 100644
--- a/sys/dev/randomdev/randomdev.c
+++ b/sys/dev/randomdev/randomdev.c
@@ -109,7 +109,7 @@ random_read(dev_t dev, struct uio *uio, int flag)
 	c = min(uio->uio_resid, PAGE_SIZE);
 	random_buf = (void *)malloc(c, M_TEMP, M_WAITOK);
 	while (uio->uio_resid > 0 && error == 0) {
-		ret = read_random(uio->uio_procp, random_buf, c);
+		ret = read_random(random_buf, c);
 		error = uiomove(random_buf, ret, uio);
 	}
 	free(random_buf, M_TEMP);
diff --git a/sys/dev/randomdev/yarrow.c b/sys/dev/randomdev/yarrow.c
index df34f659e8e4..76ae515974d2 100644
--- a/sys/dev/randomdev/yarrow.c
+++ b/sys/dev/randomdev/yarrow.c
@@ -369,7 +369,7 @@ reseed(int fastslow)
 }
 
 u_int
-read_random(struct proc *proc, void *buf, u_int count)
+read_random(void *buf, u_int count)
 {
 	static u_int64_t genval;
 	static int cur = 0;
diff --git a/sys/sys/random.h b/sys/sys/random.h
index e085cb096f88..9fadb54f8786 100644
--- a/sys/sys/random.h
+++ b/sys/sys/random.h
@@ -31,9 +31,7 @@
 
 #ifdef _KERNEL
 
-struct proc;
-
-u_int read_random(struct proc *, void *, u_int);
+u_int read_random(void *, u_int);
 
 enum esource { RANDOM_WRITE, RANDOM_KEYBOARD, RANDOM_MOUSE, RANDOM_NET, \
 		ENTROPYSOURCE };