Module Name: src
Committed By: njoly
Date: Sat Nov 26 21:41:03 UTC 2011
Modified Files:
src/sys/rump/librump/rumpkern: rump.c
Log Message:
Do not call cprng_fast32() before locks init. Makes rump build with
RUMP_LOCKDEBUG=yes work again.
To generate a diff of this commit:
cvs rdiff -u -r1.235 -r1.236 src/sys/rump/librump/rumpkern/rump.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.235 src/sys/rump/librump/rumpkern/rump.c:1.236
--- src/sys/rump/librump/rumpkern/rump.c:1.235 Sat Nov 19 22:51:30 2011
+++ src/sys/rump/librump/rumpkern/rump.c Sat Nov 26 21:41:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.c,v 1.235 2011/11/19 22:51:30 tls Exp $ */
+/* $NetBSD: rump.c,v 1.236 2011/11/26 21:41:02 njoly Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.235 2011/11/19 22:51:30 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.236 2011/11/26 21:41:02 njoly Exp $");
#include <sys/systm.h>
#define ELFSIZE ARCH_ELFSIZE
@@ -283,14 +283,6 @@ rump__init(int rump_version)
initmsgbuf(rump_msgbuf, sizeof(rump_msgbuf));
aprint_verbose("%s%s", copyright, version);
- /*
- * Seed arc4random() with a "reasonable" amount of randomness.
- * Yes, this is a quick kludge which depends on the arc4random
- * implementation.
- */
- messthestack();
- cprng_fast32();
-
if (rump_version != RUMP_VERSION) {
printf("rump version mismatch, %d vs. %d\n",
rump_version, RUMP_VERSION);
@@ -335,6 +327,14 @@ rump__init(int rump_version)
kauth_init();
+ /*
+ * Seed arc4random() with a "reasonable" amount of randomness.
+ * Yes, this is a quick kludge which depends on the arc4random
+ * implementation.
+ */
+ messthestack();
+ cprng_fast32();
+
procinit();
proc0_init();
uid_init();
