Wed Apr 15 15:22:37 2020 UTC ()

Spaces to tabs


(skrll)

diff -r1.107 -r1.108 src/sys/arch/hppa/hppa/pmap.c

--- src/sys/arch/hppa/hppa/pmap.c 2020/04/15 09:41:09	1.107
+++ src/sys/arch/hppa/hppa/pmap.c 2020/04/15 15:22:37	1.108

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pmap.c,v 1.107 2020/04/15 09:41:09 skrll Exp $	*/
+/*	$NetBSD: pmap.c,v 1.108 2020/04/15 15:22:37 skrll Exp $	*/
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matthew Fredette.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -55,27 +55,27 @@
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * References:
  * 1. PA7100LC ERS, Hewlett-Packard, March 30 1999, Public version 1.0
  * 2. PA7300LC ERS, Hewlett-Packard, March 18 1996, Version 1.0
  * 3. PA-RISC 1.1 Architecture and Instruction Set Reference Manual,
  *    Hewlett-Packard, February 1994, Third Edition
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.107 2020/04/15 09:41:09 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.108 2020/04/15 15:22:37 skrll Exp $");
 #include "opt_cputype.h"
 #include <sys/param.h>
 #include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/rwlock.h>
 #include <sys/systm.h>
 #include <uvm/uvm.h>
 #include <uvm/uvm_page_array.h>
 #include <machine/cpu.h>
 @@ -527,33 +527,33 @@ pmap_check_alias(struct vm_page *pg, vad
 	struct vm_page_md * const md = VM_PAGE_TO_MD(pg);
 	struct pv_entry *pve;
 	int ret = 0;
 	/* check for non-equ aliased mappings */
 	for (pve = md->pvh_list; pve; pve = pve->pv_next) {
 		vaddr_t pva = pve->pv_va & PV_VAMASK;
 		pte |= pmap_vp_find(pve->pv_pmap, pva);
 		if ((va & HPPA_PGAOFF) != (pva & HPPA_PGAOFF) &&
 		    (pte & PTE_PROT(TLB_WRITE))) {
 			DPRINTF(PDB_FOLLOW|PDB_ALIAS,
-                            ("%s: aliased writable mapping 0x%x:0x%lx\n",
+			    ("%s: aliased writable mapping 0x%x:0x%lx\n",
-                            __func__, pve->pv_pmap->pm_space, pve->pv_va));
+			    __func__, pve->pv_pmap->pm_space, pve->pv_va));
 			ret++;
+		}
+	}
-        return (ret);
+	return (ret);
+}
 /*
  * This allocates and returns a new struct pv_entry.
  */
 static inline struct pv_entry *
 pmap_pv_alloc(void)
+{
 	struct pv_entry *pv;
 	DPRINTF(PDB_FOLLOW|PDB_PV, ("%s()\n", __func__));
 	pv = pool_get(&pmap_pv_pool, PR_NOWAIT);
 @@ -1285,27 +1285,27 @@ pmap_enter(pmap_t pmap, vaddr_t va, padd
 			pmap->pm_stats.wired_count++;
 		if (ptp)
 			ptp->wire_count++;
+	}
 	if (pmap_initialized && (pg = PHYS_TO_VM_PAGE(pa))) {
 		if (!pve && !(pve = pmap_pv_alloc())) {
 			if (flags & PMAP_CANFAIL) {
  				PMAP_UNLOCK(pmap);
 				return (ENOMEM);
+			}
 			panic("%s: no pv entries available", __func__);
+		}
-                pte |= PTE_PROT(pmap_prot(pmap, prot));
+		pte |= PTE_PROT(pmap_prot(pmap, prot));
 		if (pmap_check_alias(pg, va, pte))
 			pmap_page_remove(pg);
 		pmap_pv_enter(pg, pve, pmap, va, ptp, 0);
 	} else if (pve) {
 		pmap_pv_free(pve);
+	}
 enter:
 	/* preserve old ref & mod */
 	pte = pa | PTE_PROT(pmap_prot(pmap, prot)) |
 	    (pte & PTE_PROT(TLB_UNCACHEABLE|TLB_DIRTY|TLB_REFTRAP));
 	if (pg != NULL) {