[src/trunk]: src/sys/arch/arm/arm32 Revert the part of the previous Whitespac...

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

details:   https://anonhg.NetBSD.org/src/rev/41042cb23c14
branches:  trunk
changeset: 450710:41042cb23c14
user:      skrll <skrll%NetBSD.org@localhost>
date:      Tue Apr 23 16:14:32 2019 +0000

description:
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.

diffstat:

 sys/arch/arm/arm32/arm32_kvminit.c |  16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diffs (38 lines):

diff -r 1a20517babfd -r 41042cb23c14 sys/arch/arm/arm32/arm32_kvminit.c
--- a/sys/arch/arm/arm32/arm32_kvminit.c        Tue Apr 23 14:40:12 2019 +0000
+++ b/sys/arch/arm/arm32/arm32_kvminit.c        Tue Apr 23 16:14:32 2019 +0000
@@ -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 @@
                cur_pv.pv_cache = PTE_CACHE;
        }
        while (pv != NULL) {
-               if (concat_pvaddr(&cur_pv, pv)) {
-                       cur_pv.pv_size += pv->pv_size;
+               if (mapallmem_p) {
+                       if (concat_pvaddr(&cur_pv, pv)) {
+                               cur_pv.pv_size += pv->pv_size;
 
-                       pv = SLIST_NEXT(pv, pv_list);
-                       continue;
-               }
-               if (mapallmem_p) {
+                               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