diff options
| author | ozaki-r <ozaki-r@NetBSD.org> | 2014-08-11 04:27:24 +0000 |
|---|---|---|
| committer | ozaki-r <ozaki-r@NetBSD.org> | 2014-08-11 04:27:24 +0000 |
| commit | 11994d3b9664d14bafae1e5465db8b4b1419c2e6 (patch) | |
| tree | 2c5caf5e9ec394c9f1325176807f9e013f41c026 | |
| parent | ca1ebbabae93eeaba2b7a3f1f387bd15b87ec270 (diff) | |
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
| -rw-r--r-- | sys/rump/librump/rumpkern/rump.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sys/rump/librump/rumpkern/rump.c b/sys/rump/librump/rumpkern/rump.c index bef79a375db..5e356372322 100644 --- a/sys/rump/librump/rumpkern/rump.c +++ b/sys/rump/librump/rumpkern/rump.c @@ -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(); |
