rename sparc kill_user_windows() to pmap_unuse_final(). provide empty stubs

on all other architectures.  remove last architecture dependent #ifdef from
uvm code.

13 files changed, 26 insertions, 19 deletions

diff --git a/sys/arch/alpha/include/pmap.h b/sys/arch/alpha/include/pmap.h
index 215e4015ce0..c8eeb16a6b6 100644
--- a/sys/arch/alpha/include/pmap.h
+++ b/sys/arch/alpha/include/pmap.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap.h,v 1.19 2004/07/13 14:51:29 tedu Exp $ */
+/* $OpenBSD: pmap.h,v 1.20 2004/08/06 22:39:10 deraadt Exp $ */
 /* $NetBSD: pmap.h,v 1.37 2000/11/19 03:16:35 thorpej Exp $ */
 
 /*-
@@ -192,6 +192,7 @@ void	pmap_tlb_shootdown_q_drain(u_long, boolean_t);
 #define pmap_update(pmap)		/* nothing (yet) */
 
 #define pmap_proc_iflush(p, va, len)	/* nothing */
+#define pmap_unuse_final(p)		/* nothing */
 
 extern	pt_entry_t *VPT;		/* Virtual Page Table */
 
diff --git a/sys/arch/amd64/include/pmap.h b/sys/arch/amd64/include/pmap.h
index 864a493abb2..fc40806932b 100644
--- a/sys/arch/amd64/include/pmap.h
+++ b/sys/arch/amd64/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.4 2004/07/19 15:09:05 art Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.5 2004/08/06 22:39:12 deraadt Exp $	*/
 /*	$NetBSD: pmap.h,v 1.1 2003/04/26 18:39:46 fvdl Exp $	*/
 
 /*
@@ -425,6 +425,7 @@ extern pd_entry_t *pdes[];
 #define pmap_valid_entry(E) 		((E) & PG_V) /* is PDE or PTE valid? */
 
 #define pmap_proc_iflush(p,va,len)	/* nothing */
+#define pmap_unuse_final(p)		/* nothing */
 
 
 /*
diff --git a/sys/arch/arm/include/pmap.h b/sys/arch/arm/include/pmap.h
index 2207858562b..7d263e7cc94 100644
--- a/sys/arch/arm/include/pmap.h
+++ b/sys/arch/arm/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.2 2004/05/20 09:20:41 kettenis Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.3 2004/08/06 22:39:12 deraadt Exp $	*/
 /*	$NetBSD: pmap.h,v 1.76 2003/09/06 09:10:46 rearnsha Exp $	*/
 
 /*
@@ -247,6 +247,7 @@ extern int		pmap_debug_level; /* Only exists if PMAP_DEBUG */
 #define pmap_phys_address(ppn)		(arm_ptob((ppn)))
 
 #define pmap_proc_iflush(p, va, len)	/* nothing */
+#define pmap_unuse_final(p)		/* nothing */
 
 /*
  * Functions that we need to export
diff --git a/sys/arch/hppa/include/pmap.h b/sys/arch/hppa/include/pmap.h
index f70b2e3448d..ddec30ddc08 100644
--- a/sys/arch/hppa/include/pmap.h
+++ b/sys/arch/hppa/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.32 2004/07/13 14:51:29 tedu Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.33 2004/08/06 22:39:12 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2002-2004 Michael Shalayeff
@@ -112,6 +112,7 @@ extern struct pdc_hwtlb pdc_hwtlb;
 #define pmap_phys_address(ppn)	((ppn) << PAGE_SHIFT)
 
 #define pmap_proc_iflush(p,va,len)	/* nothing */
+#define pmap_unuse_final(p)		/* nothing */
 
 void pmap_bootstrap(vaddr_t);
 boolean_t pmap_changebit(struct vm_page *, u_int, u_int);
diff --git a/sys/arch/i386/include/pmap.h b/sys/arch/i386/include/pmap.h
index a7089d958fd..218ba4a7b71 100644
--- a/sys/arch/i386/include/pmap.h
+++ b/sys/arch/i386/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.35 2004/06/13 21:49:16 niklas Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.36 2004/08/06 22:39:13 deraadt Exp $	*/
 /*	$NetBSD: pmap.h,v 1.44 2000/04/24 17:18:18 thorpej Exp $	*/
 
 /*
@@ -366,6 +366,7 @@ extern int pmap_pg_g;			/* do we support PG_G? */
 #define pmap_valid_entry(E) 		((E) & PG_V) /* is PDE or PTE valid? */
 
 #define pmap_proc_iflush(p,va,len)	/* nothing */
+#define pmap_unuse_final(p)		/* nothing */
 
 
 /*
diff --git a/sys/arch/m88k/include/pmap.h b/sys/arch/m88k/include/pmap.h
index 683a49e0313..014d5f5c7ed 100644
--- a/sys/arch/m88k/include/pmap.h
+++ b/sys/arch/m88k/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.3 2004/08/04 15:54:37 miod Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.4 2004/08/06 22:39:13 deraadt Exp $	*/
 /*
  * Mach Operating System
  * Copyright (c) 1991 Carnegie Mellon University
@@ -66,6 +66,7 @@ extern	caddr_t		vmmap;
 void	pmap_bootstrap(vaddr_t);
 void	pmap_cache_ctrl(pmap_t, vaddr_t, vaddr_t, u_int);
 void	pmap_proc_iflush(struct proc *, vaddr_t, vsize_t);
+#define pmap_unuse_final(p)		/* nothing */
 boolean_t pmap_unsetbit(struct vm_page *, int);
 
 #endif	/* _KERNEL */
diff --git a/sys/arch/mips64/include/pmap.h b/sys/arch/mips64/include/pmap.h
index d25cac2dbdc..1b7d8984070 100644
--- a/sys/arch/mips64/include/pmap.h
+++ b/sys/arch/mips64/include/pmap.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: pmap.h,v 1.1 2004/08/06 20:56:02 pefo Exp $ */
+/*      $OpenBSD: pmap.h,v 1.2 2004/08/06 22:39:13 deraadt Exp $ */
 
 /* 
  * Copyright (c) 1987 Carnegie-Mellon University
@@ -118,7 +118,8 @@ int pmap_is_pa_mapped(vaddr_t);
 vaddr_t pmap_pa_to_va(paddr_t);
 void pmap_page_cache(vaddr_t, int);
 
-#define pmap_proc_iflush(p,va,len) /* nothing yet (handled in trap now) */
+#define pmap_proc_iflush(p,va,len)	/* nothing yet (handled in trap now) */
+#define pmap_unuse_final(p)		/* nothing yet */
 
 void pmap_kenter_cache(vaddr_t va, paddr_t pa, vm_prot_t prot, int cache);
 
diff --git a/sys/arch/powerpc/include/pmap.h b/sys/arch/powerpc/include/pmap.h
index 30afd6d892d..9a6dfb9f29a 100644
--- a/sys/arch/powerpc/include/pmap.h
+++ b/sys/arch/powerpc/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.37 2004/07/13 14:51:29 tedu Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.38 2004/08/06 22:39:13 deraadt Exp $	*/
 /*	$NetBSD: pmap.h,v 1.1 1996/09/30 16:34:29 ws Exp $	*/
 
 /*-
@@ -135,6 +135,7 @@ int pte_spill_v(struct pmap *pm, u_int32_t va, u_int32_t dsisr, int exec_fault);
 #define pmap_copy(dst_pmap, src_pmap, dst_addr, len, src_addr) ;
 
 void pmap_proc_iflush(struct proc *proc, vaddr_t va, vsize_t len);
+#define pmap_unuse_final(p)		/* nothing */
 
 #endif	/* _KERNEL */
 #endif	/* _LOCORE */
diff --git a/sys/arch/sparc/include/cpu.h b/sys/arch/sparc/include/cpu.h
index a1ca691938a..872dce25b8f 100644
--- a/sys/arch/sparc/include/cpu.h
+++ b/sys/arch/sparc/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.21 2004/06/13 21:49:19 niklas Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.22 2004/08/06 22:39:14 deraadt Exp $	*/
 /*	$NetBSD: cpu.h,v 1.24 1997/03/15 22:25:15 pk Exp $ */
 
 /*
@@ -207,7 +207,7 @@ void	qzero(void *, size_t);
 /* locore2.c */
 void	remrunqueue(struct proc *);
 /* trap.c */
-void	kill_user_windows(struct proc *);
+void	pmap_unuse_final(struct proc *);
 int	rwindow_save(struct proc *);
 /* amd7930intr.s */
 void	amd7930_trap(void);
diff --git a/sys/arch/sparc/sparc/trap.c b/sys/arch/sparc/sparc/trap.c
index eca85b15b78..dbbc17a2997 100644
--- a/sys/arch/sparc/sparc/trap.c
+++ b/sys/arch/sparc/sparc/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.40 2003/05/12 04:42:58 jason Exp $	*/
+/*	$OpenBSD: trap.c,v 1.41 2004/08/06 22:39:14 deraadt Exp $	*/
 /*	$NetBSD: trap.c,v 1.58 1997/09/12 08:55:01 pk Exp $ */
 
 /*
@@ -624,7 +624,7 @@ rwindow_save(p)
  * the registers into the new process after the exec.
  */
 void
-kill_user_windows(p)
+pmap_unuse_final(p)
 	struct proc *p;
 {
 
diff --git a/sys/arch/sparc64/include/pmap.h b/sys/arch/sparc64/include/pmap.h
index b40e7ce2c13..977209d6ff7 100644
--- a/sys/arch/sparc64/include/pmap.h
+++ b/sys/arch/sparc64/include/pmap.h
@@ -164,6 +164,7 @@ int pmap_count_res(pmap_t pmap);
 #define	pmap_update(pm)			/* nothing (yet) */
 
 #define pmap_proc_iflush(p,va,len)	/* nothing */
+#define pmap_unuse_final(p)		/* nothing */
 
 void pmap_bootstrap(u_long kernelstart, u_long kernelend, u_int numctx);
 /* make sure all page mappings are modulo 16K to prevent d$ aliasing */
diff --git a/sys/arch/vax/include/pmap.h b/sys/arch/vax/include/pmap.h
index 791bca39020..e9cc44d8ec3 100644
--- a/sys/arch/vax/include/pmap.h
+++ b/sys/arch/vax/include/pmap.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: pmap.h,v 1.23 2004/07/13 14:51:29 tedu Exp $     */
+/*      $OpenBSD: pmap.h,v 1.24 2004/08/06 22:39:14 deraadt Exp $     */
 /*	$NetBSD: pmap.h,v 1.37 1999/08/01 13:48:07 ragge Exp $	   */
 
 /* 
@@ -144,6 +144,7 @@ extern	struct pmap kernel_pmap_store;
 } while (0)
 
 #define pmap_proc_iflush(p,va,len)	/* nothing */
+#define pmap_unuse_final(p)		/* nothing */
 
 /* Prototypes */
 void	pmap_bootstrap(void);
diff --git a/sys/uvm/uvm_map.c b/sys/uvm/uvm_map.c
index 3aba993bdf3..4fbaa4dee79 100644
--- a/sys/uvm/uvm_map.c
+++ b/sys/uvm/uvm_map.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_map.c,v 1.68 2004/07/21 01:02:09 art Exp $	*/
+/*	$OpenBSD: uvm_map.c,v 1.69 2004/08/06 22:39:14 deraadt Exp $	*/
 /*	$NetBSD: uvm_map.c,v 1.86 2000/11/27 08:40:03 chs Exp $	*/
 
 /* 
@@ -3228,10 +3228,7 @@ uvmspace_exec(p, start, end)
 	struct vmspace *nvm, *ovm = p->p_vmspace;
 	vm_map_t map = &ovm->vm_map;
 
-#ifdef __sparc__
-	/* XXX cgd 960926: the sparc #ifdef should be a MD hook */
-	kill_user_windows(p);   /* before stack addresses go away */
-#endif
+	pmap_unuse_final(p);   /* before stack addresses go away */
 
 	/*
 	 * see if more than one process is using this vmspace...