Module Name: src Committed By: skrll Date: Sat Nov 7 08:33:50 UTC 2020
Modified Files: src/sys/arch/aarch64/aarch64: pmap.c Log Message: In pmap_devmap_bootstrap only set pmap_devmap_bootstrap_done if there is an entry and ALL of the entries have been done. The entry required for EARLYCONS might not be the first/only one... To generate a diff of this commit: cvs rdiff -u -r1.94 -r1.95 src/sys/arch/aarch64/aarch64/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/aarch64/aarch64/pmap.c diff -u src/sys/arch/aarch64/aarch64/pmap.c:1.94 src/sys/arch/aarch64/aarch64/pmap.c:1.95 --- src/sys/arch/aarch64/aarch64/pmap.c:1.94 Sun Nov 1 10:58:59 2020 +++ src/sys/arch/aarch64/aarch64/pmap.c Sat Nov 7 08:33:50 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.94 2020/11/01 10:58:59 jmcneill Exp $ */ +/* $NetBSD: pmap.c,v 1.95 2020/11/07 08:33:50 skrll Exp $ */ /* * Copyright (c) 2017 Ryo Shimizu <r...@nerv.org> @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.94 2020/11/01 10:58:59 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.95 2020/11/07 08:33:50 skrll Exp $"); #include "opt_arm_debug.h" #include "opt_ddb.h" @@ -348,6 +348,7 @@ pmap_devmap_register(const struct pmap_d void pmap_devmap_bootstrap(vaddr_t l0pt, const struct pmap_devmap *table) { + bool done = false; vaddr_t va; int i; @@ -375,8 +376,10 @@ pmap_devmap_bootstrap(vaddr_t l0pt, cons table[i].pd_size, table[i].pd_prot, table[i].pd_flags); - pmap_devmap_bootstrap_done = true; + done = true; } + if (done) + pmap_devmap_bootstrap_done = true; } const struct pmap_devmap *