[src/trunk]: src/sys/arch Move cpu_rng_init a little later, just after cpu_in...

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

details:   https://anonhg.NetBSD.org/src/rev/6ec9837ce689
branches:  trunk
changeset: 932466:6ec9837ce689
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Fri May 08 00:52:29 2020 +0000

description:
Move cpu_rng_init a little later, just after cpu_init_msrs, on x86.

This way curcpu() and curlwp are available, so that we no longer need
any annoying conditionalization in kern_entropy.c.

diffstat:

 sys/arch/amd64/amd64/machdep.c |  6 +++---
 sys/arch/i386/i386/machdep.c   |  6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (59 lines):

diff -r f4fd5778d8ef -r 6ec9837ce689 sys/arch/amd64/amd64/machdep.c
--- a/sys/arch/amd64/amd64/machdep.c    Fri May 08 00:49:42 2020 +0000
+++ b/sys/arch/amd64/amd64/machdep.c    Fri May 08 00:52:29 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.353 2020/05/08 00:49:42 riastradh Exp $  */
+/*     $NetBSD: machdep.c,v 1.354 2020/05/08 00:52:29 riastradh Exp $  */
 
 /*
  * Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008, 2011
@@ -110,7 +110,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.353 2020/05/08 00:49:42 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.354 2020/05/08 00:52:29 riastradh Exp $");
 
 #include "opt_modular.h"
 #include "opt_user_ldt.h"
@@ -1702,11 +1702,11 @@
        uvm_lwp_setuarea(&lwp0, lwp0uarea);
 
        cpu_probe(&cpu_info_primary);
-       cpu_rng_init();
 #ifdef SVS
        svs_init();
 #endif
        cpu_init_msrs(&cpu_info_primary, true);
+       cpu_rng_init();
 #ifndef XENPV
        cpu_speculation_init(&cpu_info_primary);
 #endif
diff -r f4fd5778d8ef -r 6ec9837ce689 sys/arch/i386/i386/machdep.c
--- a/sys/arch/i386/i386/machdep.c      Fri May 08 00:49:42 2020 +0000
+++ b/sys/arch/i386/i386/machdep.c      Fri May 08 00:52:29 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.829 2020/05/02 16:44:35 bouyer Exp $     */
+/*     $NetBSD: machdep.c,v 1.830 2020/05/08 00:52:29 riastradh Exp $  */
 
 /*
  * Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008, 2009, 2017
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.829 2020/05/02 16:44:35 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.830 2020/05/08 00:52:29 riastradh Exp $");
 
 #include "opt_beep.h"
 #include "opt_compat_freebsd.h"
@@ -1150,8 +1150,8 @@
        uvm_lwp_setuarea(&lwp0, lwp0uarea);
 
        cpu_probe(&cpu_info_primary);
+       cpu_init_msrs(&cpu_info_primary, true);
        cpu_rng_init();
-       cpu_init_msrs(&cpu_info_primary, true);
 #ifndef XENPV
        cpu_speculation_init(&cpu_info_primary);
 #endif