Change pmap_proc_iflush() to take a process instead of a proc

powerpc: rename second argument of pmap_proc_iflush() to match other archs

ok kettenis@

10 files changed, 28 insertions, 28 deletions

diff --git a/sys/arch/arm/arm/pmap.c b/sys/arch/arm/arm/pmap.c
index 3340253cfa2..22d98c2d697 100644
--- a/sys/arch/arm/arm/pmap.c
+++ b/sys/arch/arm/arm/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.65 2016/09/15 02:00:17 dlg Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.66 2016/10/19 08:28:19 guenther Exp $	*/
 /*	$NetBSD: pmap.c,v 1.147 2004/01/18 13:03:50 scw Exp $	*/
 
 /*
@@ -2790,10 +2790,10 @@ pmap_collect(pmap_t pm)
  *
  */
 void
-pmap_proc_iflush(struct proc *p, vaddr_t va, vsize_t len)
+pmap_proc_iflush(struct process *pr, vaddr_t va, vsize_t len)
 {
 	/* We only need to do anything if it is the current process. */
-	if (p == curproc)
+	if (pr == curproc->p_p)
 		cpu_icache_sync_range(va, len);
 }
 
diff --git a/sys/arch/arm/arm/pmap7.c b/sys/arch/arm/arm/pmap7.c
index e9f9299581d..b7e0b6fa7f2 100644
--- a/sys/arch/arm/arm/pmap7.c
+++ b/sys/arch/arm/arm/pmap7.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap7.c,v 1.53 2016/09/24 13:03:47 kettenis Exp $	*/
+/*	$OpenBSD: pmap7.c,v 1.54 2016/10/19 08:28:19 guenther Exp $	*/
 /*	$NetBSD: pmap.c,v 1.147 2004/01/18 13:03:50 scw Exp $	*/
 
 /*
@@ -1766,10 +1766,10 @@ pmap_collect(pmap_t pm)
  *
  */
 void
-pmap_proc_iflush(struct proc *p, vaddr_t va, vsize_t len)
+pmap_proc_iflush(struct process *pr, vaddr_t va, vsize_t len)
 {
 	/* We only need to do anything if it is the current process. */
-	if (p == curproc)
+	if (pr == curproc->p_p)
 		cpu_icache_sync_range(va, len);
 }
 
diff --git a/sys/arch/hppa/hppa/pmap.c b/sys/arch/hppa/hppa/pmap.c
index 83697b67fc9..034d040b9eb 100644
--- a/sys/arch/hppa/hppa/pmap.c
+++ b/sys/arch/hppa/hppa/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.171 2016/09/16 02:35:41 dlg Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.172 2016/10/19 08:28:20 guenther Exp $	*/
 
 /*
  * Copyright (c) 1998-2004 Michael Shalayeff
@@ -1250,9 +1250,9 @@ pmap_kremove(vaddr_t va, vsize_t size)
 }
 
 void
-pmap_proc_iflush(struct proc *p, vaddr_t va, vsize_t len)
+pmap_proc_iflush(struct process *pr, vaddr_t va, vsize_t len)
 {
-	pmap_t pmap = vm_map_pmap(&p->p_vmspace->vm_map);
+	pmap_t pmap = vm_map_pmap(&pr->ps_vmspace->vm_map);
 
 	fdcache(pmap->pm_space, va, len);
 	sync_caches();
diff --git a/sys/arch/m88k/m88k/pmap.c b/sys/arch/m88k/m88k/pmap.c
index a8e106f760e..1117b2abb99 100644
--- a/sys/arch/m88k/m88k/pmap.c
+++ b/sys/arch/m88k/m88k/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.84 2016/09/15 02:00:17 dlg Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.85 2016/10/19 08:28:20 guenther Exp $	*/
 
 /*
  * Copyright (c) 2001-2004, 2010, Miodrag Vallat.
@@ -1817,9 +1817,9 @@ pmap_clean_page(paddr_t pa)
  * Flushes instruction cache for the range `va'..`va'+`len' in proc `p'.
  */
 void
-pmap_proc_iflush(struct proc *p, vaddr_t va, vsize_t len)
+pmap_proc_iflush(struct process *pr, vaddr_t va, vsize_t len)
 {
-	pmap_t pmap = vm_map_pmap(&p->p_vmspace->vm_map);
+	pmap_t pmap = vm_map_pmap(&pr->ps_vmspace->vm_map);
 	paddr_t pa;
 	vsize_t count;
 	struct cpu_info *ci;
diff --git a/sys/arch/mips64/mips64/pmap.c b/sys/arch/mips64/mips64/pmap.c
index e0c3ea47b99..f0b5531c4e9 100644
--- a/sys/arch/mips64/mips64/pmap.c
+++ b/sys/arch/mips64/mips64/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.93 2016/10/08 05:49:09 guenther Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.94 2016/10/19 08:28:20 guenther Exp $	*/
 
 /*
  * Copyright (c) 2001-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -1987,10 +1987,10 @@ pmap_pg_free(struct pool *pp, void *item)
 }
 
 void
-pmap_proc_iflush(struct proc *p, vaddr_t va, vsize_t len)
+pmap_proc_iflush(struct process *pr, vaddr_t va, vsize_t len)
 {
 #ifdef MULTIPROCESSOR
-	struct pmap *pmap = vm_map_pmap(&p->p_vmspace->vm_map);
+	struct pmap *pmap = vm_map_pmap(&pr->ps_vmspace->vm_map);
 	CPU_INFO_ITERATOR cii;
 	struct cpu_info *ci;
 
diff --git a/sys/arch/mips64/mips64/trap.c b/sys/arch/mips64/mips64/trap.c
index ca67ccbebba..7539154a7a1 100644
--- a/sys/arch/mips64/mips64/trap.c
+++ b/sys/arch/mips64/mips64/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.120 2016/10/19 08:23:37 guenther Exp $	*/
+/*	$OpenBSD: trap.c,v 1.121 2016/10/19 08:28:20 guenther Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -1534,7 +1534,7 @@ fpe_branch_emulate(struct proc *p, struct trapframe *tf, uint32_t insn,
 	p->p_md.md_fpslotva = (vaddr_t)tf->pc + 4;
 	p->p_md.md_flags |= MDP_FPUSED;
 	tf->pc = p->p_md.md_fppgva;
-	pmap_proc_iflush(p, tf->pc, 2 * 4);
+	pmap_proc_iflush(p->p_p, tf->pc, 2 * 4);
 
 	return 0;
 
diff --git a/sys/arch/powerpc/powerpc/pmap.c b/sys/arch/powerpc/powerpc/pmap.c
index ef9624a4f1d..3899d460f2c 100644
--- a/sys/arch/powerpc/powerpc/pmap.c
+++ b/sys/arch/powerpc/powerpc/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.165 2016/09/15 02:00:17 dlg Exp $ */
+/*	$OpenBSD: pmap.c,v 1.166 2016/10/19 08:28:20 guenther Exp $ */
 
 /*
  * Copyright (c) 2015 Martin Pieuchot
@@ -2158,23 +2158,23 @@ pmap_init()
 }
 
 void
-pmap_proc_iflush(struct proc *p, vaddr_t addr, vsize_t len)
+pmap_proc_iflush(struct process *pr, vaddr_t va, vsize_t len)
 {
 	paddr_t pa;
 	vsize_t clen;
 
 	while (len > 0) {
 		/* add one to always round up to the next page */
-		clen = round_page(addr + 1) - addr;
+		clen = round_page(va + 1) - va;
 		if (clen > len)
 			clen = len;
 
-		if (pmap_extract(p->p_vmspace->vm_map.pmap, addr, &pa)) {
+		if (pmap_extract(pr->ps_vmspace->vm_map.pmap, va, &pa)) {
 			syncicache((void *)pa, clen);
 		}
 
 		len -= clen;
-		addr += clen;
+		va += clen;
 	}
 }
 
diff --git a/sys/arch/sh/sh/pmap.c b/sys/arch/sh/sh/pmap.c
index 47d7f0c0bcc..ccb17ec6b3e 100644
--- a/sys/arch/sh/sh/pmap.c
+++ b/sys/arch/sh/sh/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.27 2016/10/19 01:34:47 guenther Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.28 2016/10/19 08:28:20 guenther Exp $	*/
 /*	$NetBSD: pmap.c,v 1.55 2006/08/07 23:19:36 tsutsui Exp $	*/
 
 /*-
@@ -756,7 +756,7 @@ pmap_unwire(pmap_t pmap, vaddr_t va)
 }
 
 void
-pmap_proc_iflush(struct proc *p, vaddr_t va, size_t len)
+pmap_proc_iflush(struct process *pr, vaddr_t va, vsize_t len)
 {
 	if (!SH_HAS_UNIFIED_CACHE)
 		sh_icache_sync_range_index(va, len);
diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c
index 1f7a5708c1b..29903e38da8 100644
--- a/sys/kern/sys_process.c
+++ b/sys/kern/sys_process.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sys_process.c,v 1.71 2016/10/09 22:46:48 guenther Exp $	*/
+/*	$OpenBSD: sys_process.c,v 1.72 2016/10/19 08:28:19 guenther Exp $	*/
 /*	$NetBSD: sys_process.c,v 1.55 1996/05/15 06:17:47 tls Exp $	*/
 
 /*-
@@ -735,7 +735,7 @@ process_domem(struct proc *curp, struct proc *p, struct uio *uio, int req)
 	uvmspace_free(vm);
 
 	if (error == 0 && req == PT_WRITE_I)
-		pmap_proc_iflush(p, addr, len);
+		pmap_proc_iflush(p->p_p, addr, len);
 
 	return (error);
 }
diff --git a/sys/uvm/uvm_pmap.h b/sys/uvm/uvm_pmap.h
index 1d9fab71aa4..a8f5eafbc2b 100644
--- a/sys/uvm/uvm_pmap.h
+++ b/sys/uvm/uvm_pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_pmap.h,v 1.26 2016/03/03 12:41:30 naddy Exp $	*/
+/*	$OpenBSD: uvm_pmap.h,v 1.27 2016/10/19 08:28:19 guenther Exp $	*/
 /*	$NetBSD: uvm_pmap.h,v 1.1 2000/06/27 09:00:14 mrg Exp $	*/
 
 /* 
@@ -149,7 +149,7 @@ boolean_t	 pmap_is_referenced(struct vm_page *);
 void		 pmap_page_protect(struct vm_page *, vm_prot_t);
 
 #if !defined(pmap_proc_iflush)
-void		pmap_proc_iflush(struct proc *, vaddr_t, vsize_t);
+void		pmap_proc_iflush(struct process *, vaddr_t, vsize_t);
 #endif
 void		 pmap_protect(pmap_t, vaddr_t, vaddr_t, vm_prot_t);
 #if !defined(pmap_reference)