[src/trunk]: src/sys/arch/powerpc/booke When pmap_bootstrap is called, kcpuse...

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

details:   https://anonhg.NetBSD.org/src/rev/2d3ada6bf1c7
branches:  trunk
changeset: 335773:2d3ada6bf1c7
user:      nonaka <nonaka%NetBSD.org@localhost>
date:      Fri Jan 23 06:39:41 2015 +0000

description:
When pmap_bootstrap is called, kcpuset_running has not been created yet.

diffstat:

 sys/arch/powerpc/booke/booke_machdep.c |  7 +++++--
 sys/arch/powerpc/booke/booke_pmap.c    |  8 ++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diffs (57 lines):

diff -r 663d0da9e6b1 -r 2d3ada6bf1c7 sys/arch/powerpc/booke/booke_machdep.c
--- a/sys/arch/powerpc/booke/booke_machdep.c    Fri Jan 23 06:16:23 2015 +0000
+++ b/sys/arch/powerpc/booke/booke_machdep.c    Fri Jan 23 06:39:41 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: booke_machdep.c,v 1.21 2014/09/22 21:35:15 matt Exp $  */
+/*     $NetBSD: booke_machdep.c,v 1.22 2015/01/23 06:39:41 nonaka Exp $        */
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -38,7 +38,7 @@
 #define        _POWERPC_BUS_DMA_PRIVATE
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: booke_machdep.c,v 1.21 2014/09/22 21:35:15 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: booke_machdep.c,v 1.22 2015/01/23 06:39:41 nonaka Exp $");
 
 #include "opt_modular.h"
 
@@ -207,6 +207,9 @@
        fake_mapiodev = 0;
 
 #ifdef MULTIPROCESSOR
+       pmap_kernel()->pm_active = kcpuset_running;
+       pmap_kernel()->pm_onproc = kcpuset_running;
+
        for (size_t i = 1; i < __arraycount(cpu_info); i++) {
                struct cpu_info * const ci = &cpu_info[i];
                struct cpu_softc * const cpu = &cpu_softc[i];
diff -r 663d0da9e6b1 -r 2d3ada6bf1c7 sys/arch/powerpc/booke/booke_pmap.c
--- a/sys/arch/powerpc/booke/booke_pmap.c       Fri Jan 23 06:16:23 2015 +0000
+++ b/sys/arch/powerpc/booke/booke_pmap.c       Fri Jan 23 06:39:41 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: booke_pmap.c,v 1.20 2015/01/09 11:45:11 nonaka Exp $   */
+/*     $NetBSD: booke_pmap.c,v 1.21 2015/01/23 06:39:41 nonaka Exp $   */
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -38,7 +38,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: booke_pmap.c,v 1.20 2015/01/09 11:45:11 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: booke_pmap.c,v 1.21 2015/01/23 06:39:41 nonaka Exp $");
 
 #include <sys/param.h>
 #include <sys/kcore.h>
@@ -160,10 +160,6 @@
         */
        pmap_kernel()->pm_segtab = stp;
        curcpu()->ci_pmap_kern_segtab = stp;
-#ifdef MULTIPROCESSOR
-       pmap_kernel()->pm_active = kcpuset_running;
-       pmap_kernel()->pm_onproc = kcpuset_running;
-#endif
 
        KASSERT(endkernel == trunc_page(endkernel));