[src/trunk]: src/sys Defer cprng_fast_init until CPUs are detected.

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7a3b64b0c00e
branches:  trunk
changeset: 801711:7a3b64b0c00e
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Thu Aug 14 16:27:55 2014 +0000

description:
Defer cprng_fast_init until CPUs are detected.

diffstat:

 sys/kern/init_main.c             |  9 +++++----
 sys/rump/librump/rumpkern/rump.c |  8 +++++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diffs (73 lines):

diff -r 4806fc04614f -r 7a3b64b0c00e sys/kern/init_main.c
--- a/sys/kern/init_main.c      Thu Aug 14 16:27:17 2014 +0000
+++ b/sys/kern/init_main.c      Thu Aug 14 16:27:55 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: init_main.c,v 1.458 2014/08/10 16:44:36 tls Exp $      */
+/*     $NetBSD: init_main.c,v 1.459 2014/08/14 16:27:55 riastradh Exp $        */
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.458 2014/08/10 16:44:36 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.459 2014/08/14 16:27:55 riastradh Exp $");
 
 #include "opt_ddb.h"
 #include "opt_ipsec.h"
@@ -501,8 +501,6 @@
        kern_cprng = cprng_strong_create("kernel", IPL_VM,
                                         CPRNG_INIT_ANY|CPRNG_REKEY_ANY);
 
-       cprng_fast_init();
-                                        
        /* Initialize interfaces. */
        ifinit1();
 
@@ -514,6 +512,9 @@
        /* Configure the system hardware.  This will enable interrupts. */
        configure();
 
+       /* Once all CPUs are detected, initialize the per-CPU cprng_fast.  */
+       cprng_fast_init();
+
        ssp_init();
 
        ubc_init();             /* must be after autoconfig */
diff -r 4806fc04614f -r 7a3b64b0c00e sys/rump/librump/rumpkern/rump.c
--- a/sys/rump/librump/rumpkern/rump.c  Thu Aug 14 16:27:17 2014 +0000
+++ b/sys/rump/librump/rumpkern/rump.c  Thu Aug 14 16:27:55 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rump.c,v 1.308 2014/08/11 04:27:24 ozaki-r Exp $       */
+/*     $NetBSD: rump.c,v 1.309 2014/08/14 16:27:56 riastradh 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.308 2014/08/11 04:27:24 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.309 2014/08/14 16:27:56 riastradh Exp $");
 
 #include <sys/systm.h>
 #define ELFSIZE ARCH_ELFSIZE
@@ -305,7 +305,6 @@
        kern_cprng = cprng_strong_create("kernel", IPL_VM,
            CPRNG_INIT_ANY|CPRNG_REKEY_ANY);
 
-       cprng_fast_init();
        rump_hyperentropy_init();
 
        procinit();
@@ -364,6 +363,9 @@
                aprint_verbose("cpu%d at thinair0: rump virtual cpu\n", i);
        }
 
+       /* Once all CPUs are detected, initialize the per-CPU cprng_fast.  */
+       cprng_fast_init();
+
        /* CPUs are up.  allow kernel threads to run */
        rump_thread_allow(NULL);