Module Name: src
Committed By: riastradh
Date: Mon Apr 13 15:23:01 UTC 2015
Modified Files:
src/sys/kern: kern_rndq.c
src/sys/sys: rnd.h
Log Message:
Little rnd.h cleanup.
- Make rnd_printing static in kern_rndq.c.
- Merge some #ifdef _KERNEL blocks.
- Fix comments about RND_DEV_(U)RANDOM.
- Move rnd_ready to rnd_private.h.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/kern/kern_rndq.c
cvs rdiff -u -r1.45 -r1.46 src/sys/sys/rnd.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_rndq.c
diff -u src/sys/kern/kern_rndq.c:1.45 src/sys/kern/kern_rndq.c:1.46
--- src/sys/kern/kern_rndq.c:1.45 Mon Apr 13 15:13:50 2015
+++ src/sys/kern/kern_rndq.c Mon Apr 13 15:23:01 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_rndq.c,v 1.45 2015/04/13 15:13:50 riastradh Exp $ */
+/* $NetBSD: kern_rndq.c,v 1.46 2015/04/13 15:23:01 riastradh Exp $ */
/*-
* Copyright (c) 1997-2013 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_rndq.c,v 1.45 2015/04/13 15:13:50 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_rndq.c,v 1.46 2015/04/13 15:23:01 riastradh Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -176,7 +176,8 @@ static inline void rnd_schedule_process(
int rnd_ready = 0;
int rnd_initial_entropy = 0;
-int rnd_printing = 0;
+
+static int rnd_printing = 0;
#ifdef DIAGNOSTIC
static int rnd_tested = 0;
Index: src/sys/sys/rnd.h
diff -u src/sys/sys/rnd.h:1.45 src/sys/sys/rnd.h:1.46
--- src/sys/sys/rnd.h:1.45 Mon Apr 13 15:13:50 2015
+++ src/sys/sys/rnd.h Mon Apr 13 15:23:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rnd.h,v 1.45 2015/04/13 15:13:50 riastradh Exp $ */
+/* $NetBSD: rnd.h,v 1.46 2015/04/13 15:23:00 riastradh Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -42,15 +42,12 @@
#ifdef _KERNEL
#include <sys/queue.h>
-#include <sys/systm.h>
-#endif
-
-#ifdef _KERNEL
#include <sys/rngtest.h>
+#include <sys/systm.h>
#endif
-#define RND_DEV_RANDOM 0 /* minor devices for random and kinda random */
-#define RND_DEV_URANDOM 1
+#define RND_DEV_RANDOM 0 /* minor for blocking until unpredictable */
+#define RND_DEV_URANDOM 1 /* minor for randomly generating data */
/*
* Exposed "size" of entropy pool, for convenience in load/save
@@ -228,9 +225,6 @@ rnd_add_uint64(krndsource_t *kr, uint64_
extern int rnd_initial_entropy;
-extern int rnd_ready;
-extern int rnd_printing; /* XXX recursion through printf */
-
#endif /* _KERNEL */
#define RND_MAXSTATCOUNT 10 /* 10 sources at once max */
