Module Name: src
Committed By: skrll
Date: Tue Apr 23 16:14:32 UTC 2019
Modified Files:
src/sys/arch/arm/arm32: arm32_kvminit.c
Log Message:
Revert the part of the previous Whitespace commit which clearly was
functional.
This will probably come back with other changes and a proper commit
message.
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/arm/arm32/arm32_kvminit.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/arm32_kvminit.c
diff -u src/sys/arch/arm/arm32/arm32_kvminit.c:1.53 src/sys/arch/arm/arm32/arm32_kvminit.c:1.54
--- src/sys/arch/arm/arm32/arm32_kvminit.c:1.53 Sun Mar 17 08:38:52 2019
+++ src/sys/arch/arm/arm32/arm32_kvminit.c Tue Apr 23 16:14:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: arm32_kvminit.c,v 1.53 2019/03/17 08:38:52 skrll Exp $ */
+/* $NetBSD: arm32_kvminit.c,v 1.54 2019/04/23 16:14:32 skrll Exp $ */
/*
* Copyright (c) 2002, 2003, 2005 Genetec Corporation. All rights reserved.
@@ -127,7 +127,7 @@
#include "opt_multiprocessor.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arm32_kvminit.c,v 1.53 2019/03/17 08:38:52 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm32_kvminit.c,v 1.54 2019/04/23 16:14:32 skrll Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -753,13 +753,13 @@ arm32_kernel_vm_init(vaddr_t kernel_vm_b
cur_pv.pv_cache = PTE_CACHE;
}
while (pv != NULL) {
- if (concat_pvaddr(&cur_pv, pv)) {
- cur_pv.pv_size += pv->pv_size;
-
- pv = SLIST_NEXT(pv, pv_list);
- continue;
- }
if (mapallmem_p) {
+ if (concat_pvaddr(&cur_pv, pv)) {
+ cur_pv.pv_size += pv->pv_size;
+
+ pv = SLIST_NEXT(pv, pv_list);
+ continue;
+ }
if (cur_pv.pv_pa + cur_pv.pv_size < pv->pv_pa) {
/*
* See if we can extend the current pv to emcompass the
