Module Name: src
Committed By: ozaki-r
Date: Mon Aug 11 04:27:24 UTC 2014
Modified Files:
src/sys/rump/librump/rumpkern: rump.c
Log Message:
Do cprng_fast_init in rump_init
It fixes rump bootup failure:
panic: kernel diagnostic assertion "off < percpu_nextoff" failed:
file "/usr/src/lib/librump/../../sys/rump/../kern/subr_percpu.c", line 76
To generate a diff of this commit:
cvs rdiff -u -r1.307 -r1.308 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.307 src/sys/rump/librump/rumpkern/rump.c:1.308
--- src/sys/rump/librump/rumpkern/rump.c:1.307 Sun Jun 29 11:36:52 2014
+++ src/sys/rump/librump/rumpkern/rump.c Mon Aug 11 04:27:24 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.c,v 1.307 2014/06/29 11:36:52 justin Exp $ */
+/* $NetBSD: rump.c,v 1.308 2014/08/11 04:27:24 ozaki-r 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.307 2014/06/29 11:36:52 justin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.308 2014/08/11 04:27:24 ozaki-r Exp $");
#include <sys/systm.h>
#define ELFSIZE ARCH_ELFSIZE
@@ -286,6 +286,8 @@ rump_init(void)
uvm_ra_init();
uao_init();
+ percpu_init();
+
mutex_obj_init();
callout_startup();
@@ -302,6 +304,8 @@ rump_init(void)
cprng_init();
kern_cprng = cprng_strong_create("kernel", IPL_VM,
CPRNG_INIT_ANY|CPRNG_REKEY_ANY);
+
+ cprng_fast_init();
rump_hyperentropy_init();
procinit();
@@ -324,7 +328,6 @@ rump_init(void)
rump_schedule();
bootlwp = curlwp;
- percpu_init();
inittimecounter();
ntp_init();
