CVS commit: src/sys/arch/powerpc/booke

[NONAKA Kimihiro]

Module Name:    src
Committed By:   nonaka
Date:           Fri Jan 23 06:39:41 UTC 2015

Modified Files:
        src/sys/arch/powerpc/booke: booke_machdep.c booke_pmap.c

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


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/powerpc/booke/booke_machdep.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/powerpc/booke/booke_pmap.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/powerpc/booke/booke_machdep.c
diff -u src/sys/arch/powerpc/booke/booke_machdep.c:1.21 src/sys/arch/powerpc/booke/booke_machdep.c:1.22
--- src/sys/arch/powerpc/booke/booke_machdep.c:1.21	Mon Sep 22 21:35:15 2014
+++ src/sys/arch/powerpc/booke/booke_machdep.c	Fri Jan 23 06:39:41 2015
@@ -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 @@ booke_cpu_startup(const char *model)
 	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];

Index: src/sys/arch/powerpc/booke/booke_pmap.c
diff -u src/sys/arch/powerpc/booke/booke_pmap.c:1.20 src/sys/arch/powerpc/booke/booke_pmap.c:1.21
--- src/sys/arch/powerpc/booke/booke_pmap.c:1.20	Fri Jan  9 11:45:11 2015
+++ src/sys/arch/powerpc/booke/booke_pmap.c	Fri Jan 23 06:39:41 2015
@@ -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_bootstrap(vaddr_t startkernel, vadd
 	 */
 	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));