Module Name: src Committed By: skrll Date: Sat Mar 19 09:54:25 UTC 2022
Modified Files: src/sys/arch/arm/arm32: pmap.c Log Message: Alight code re-organisation so it better matches the VPRINTF headings it is under. NFCI. To generate a diff of this commit: cvs rdiff -u -r1.433 -r1.434 src/sys/arch/arm/arm32/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/arm/arm32/pmap.c diff -u src/sys/arch/arm/arm32/pmap.c:1.433 src/sys/arch/arm/arm32/pmap.c:1.434 --- src/sys/arch/arm/arm32/pmap.c:1.433 Sat Mar 12 15:32:31 2022 +++ src/sys/arch/arm/arm32/pmap.c Sat Mar 19 09:54:25 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.433 2022/03/12 15:32:31 riastradh Exp $ */ +/* $NetBSD: pmap.c,v 1.434 2022/03/19 09:54:25 skrll Exp $ */ /* * Copyright 2003 Wasabi Systems, Inc. @@ -192,7 +192,7 @@ #endif #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.433 2022/03/12 15:32:31 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.434 2022/03/19 09:54:25 skrll Exp $"); #include <sys/param.h> #include <sys/types.h> @@ -6229,6 +6229,7 @@ pmap_bootstrap(vaddr_t vstart, vaddr_t v * Initialise the kernel pmap object */ curcpu()->ci_pmap_cur = pm; + pm->pm_refs = 1; #ifdef ARM_MMU_EXTENDED pm->pm_l1 = l1pt; pm->pm_l1_pa = kernel_l1pt.pv_pa; @@ -6242,6 +6243,7 @@ pmap_bootstrap(vaddr_t vstart, vaddr_t v #else pm->pm_l1 = l1; #endif + mutex_init(&pm->pm_lock, MUTEX_DEFAULT, IPL_VM); VPRINTF("locks "); /* @@ -6250,8 +6252,6 @@ pmap_bootstrap(vaddr_t vstart, vaddr_t v */ mutex_init(&pmap_lock, MUTEX_DEFAULT, IPL_VM); mutex_init(&kpm_lock, MUTEX_DEFAULT, IPL_NONE); - mutex_init(&pm->pm_lock, MUTEX_DEFAULT, IPL_VM); - pm->pm_refs = 1; VPRINTF("l1pt "); /*