Rename pmap_procwr() to pmap_proc_iflush() to get the intended behaviour.

2 files changed, 4 insertions, 8 deletions

diff --git a/sys/arch/arm/arm/pmap.c b/sys/arch/arm/arm/pmap.c
index 29757271a64..06232c1e4db 100644
--- a/sys/arch/arm/arm/pmap.c
+++ b/sys/arch/arm/arm/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.32 2011/09/20 22:02:11 miod Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.33 2011/09/21 10:12:58 miod Exp $	*/
 /*	$NetBSD: pmap.c,v 1.147 2004/01/18 13:03:50 scw Exp $	*/
 
 /*
@@ -2962,14 +2962,14 @@ pmap_collect(pmap_t pm)
 }
 
 /*
- * Routine:	pmap_procwr
+ * Routine:	pmap_proc_iflush
  *
  * Function:
  *	Synchronize caches corresponding to [addr, addr+len) in p.
  *
  */
 void
-pmap_procwr(struct proc *p, vaddr_t va, int len)
+pmap_proc_iflush(struct proc *p, vaddr_t va, vsize_t len)
 {
 	/* We only need to do anything if it is the current process. */
 	if (p == curproc)
diff --git a/sys/arch/arm/include/pmap.h b/sys/arch/arm/include/pmap.h
index 8a1db4759dc..d2aebb80c1a 100644
--- a/sys/arch/arm/include/pmap.h
+++ b/sys/arch/arm/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.19 2011/09/20 22:02:13 miod Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.20 2011/09/21 10:12:59 miod Exp $	*/
 /*	$NetBSD: pmap.h,v 1.76 2003/09/06 09:10:46 rearnsha Exp $	*/
 
 /*
@@ -243,19 +243,15 @@ extern int		pmap_debug_level; /* Only exists if PMAP_DEBUG */
 #define	pmap_deactivate(p)		do { /* nothing */ } while (0)
 #define	pmap_copy(dp, sp, da, l, sa)	do { /* nothing */ } while (0)
 
-#define pmap_proc_iflush(p, va, len)	do { /* nothing */ } while (0)
 #define pmap_unuse_final(p)		do { /* nothing */ } while (0)
 #define	pmap_remove_holes(map)		do { /* nothing */ } while (0)
 
 /*
  * Functions that we need to export
  */
-void	pmap_procwr(struct proc *, vaddr_t, int);
 void	pmap_remove_all(pmap_t);
-boolean_t pmap_extract(pmap_t, vaddr_t, paddr_t *);
 void	pmap_uncache_page(paddr_t, vaddr_t);
 
-#define	PMAP_NEED_PROCWR
 #define PMAP_GROWKERNEL		/* turn on pmap_growkernel interface */
 
 /* Functions we use internally. */