Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/rump/librump/rumpkern Do cprng_fast_init in rump_init
details: https://anonhg.NetBSD.org/src/rev/fc48726a9f88
branches: trunk
changeset: 798218:fc48726a9f88
user: ozaki-r <ozaki-r%NetBSD.org@localhost>
date: Mon Aug 11 04:27:24 2014 +0000
description:
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
diffstat:
sys/rump/librump/rumpkern/rump.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diffs (44 lines):
diff -r 02bd43383e4b -r fc48726a9f88 sys/rump/librump/rumpkern/rump.c
--- a/sys/rump/librump/rumpkern/rump.c Mon Aug 11 04:26:53 2014 +0000
+++ b/sys/rump/librump/rumpkern/rump.c Mon Aug 11 04:27:24 2014 +0000
@@ -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 @@
uvm_ra_init();
uao_init();
+ percpu_init();
+
mutex_obj_init();
callout_startup();
@@ -302,6 +304,8 @@
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_schedule();
bootlwp = curlwp;
- percpu_init();
inittimecounter();
ntp_init();
Home |
Main Index |
Thread Index |
Old Index