PMAP_NEW is no longer an option on sparc.

1 files changed, 1 insertions, 38 deletions

diff --git a/sys/arch/sparc/include/pmap.h b/sys/arch/sparc/include/pmap.h
index d5d2d2fa7fa..69f65fd826c 100644
--- a/sys/arch/sparc/include/pmap.h
+++ b/sys/arch/sparc/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.19 2001/06/10 01:45:03 deraadt Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.20 2001/06/27 18:30:30 art Exp $	*/
 /*	$NetBSD: pmap.h,v 1.30 1997/08/04 20:00:47 pk Exp $ */
 
 /*
@@ -286,11 +286,7 @@ void		*pmap_bootstrap_alloc __P((int));
 void		pmap_unwire __P((pmap_t, vaddr_t));
 void		pmap_collect __P((pmap_t));
 void		pmap_copy __P((pmap_t, pmap_t, vaddr_t, vsize_t, vaddr_t));
-#ifdef PMAP_NEW
 pmap_t		pmap_create __P((void));
-#else
-pmap_t		pmap_create __P((vsize_t));
-#endif
 void		pmap_destroy __P((pmap_t));
 void		pmap_init __P((void));
 vaddr_t		pmap_map __P((vaddr_t, paddr_t, paddr_t, int));
@@ -316,29 +312,18 @@ void		pmap_writetext __P((unsigned char *, int));
 /* SUN4/SUN4C SPECIFIC DECLARATIONS */
 
 #if defined(SUN4) || defined(SUN4C)
-#ifdef PMAP_NEW
 boolean_t	pmap_clear_modify4_4c __P((struct vm_page *));
 boolean_t	pmap_clear_reference4_4c __P((struct vm_page *));
-#else
-void		pmap_clear_modify4_4c __P((paddr_t pa));
-void		pmap_clear_reference4_4c __P((paddr_t pa));
-#endif
 void		pmap_copy_page4_4c __P((paddr_t, paddr_t));
 void		pmap_enter4_4c __P((pmap_t, vaddr_t, paddr_t, vm_prot_t,
 				    boolean_t, vm_prot_t));
 boolean_t	pmap_extract4_4c __P((pmap_t, vaddr_t, paddr_t *));
-#ifdef PMAP_NEW
 boolean_t	pmap_is_modified4_4c __P((struct vm_page *));
 boolean_t	pmap_is_referenced4_4c __P((struct vm_page *));
 void		pmap_kenter_pa4_4c __P((vaddr_t, paddr_t, vm_prot_t));
 void		pmap_kenter_pgs4_4c __P((vaddr_t, struct vm_page **, int));
 void		pmap_kremove4_4c __P((vaddr_t, vsize_t));
 void		pmap_page_protect4_4c __P((struct vm_page *, vm_prot_t));
-#else
-boolean_t	pmap_is_modified4_4c __P((paddr_t pa));
-boolean_t	pmap_is_referenced4_4c __P((paddr_t pa));
-void		pmap_page_protect4_4c __P((paddr_t, vm_prot_t));
-#endif
 void		pmap_protect4_4c __P((pmap_t, vaddr_t, vaddr_t, vm_prot_t));
 void		pmap_zero_page4_4c __P((paddr_t));
 void		pmap_changeprot4_4c __P((pmap_t, vaddr_t, vm_prot_t, int));
@@ -347,29 +332,18 @@ void		pmap_changeprot4_4c __P((pmap_t, vaddr_t, vm_prot_t, int));
 /* SIMILAR DECLARATIONS FOR SUN4M MODULE */
 
 #if defined(SUN4M)
-#ifdef PMAP_NEW
 boolean_t	pmap_clear_modify4m __P((struct vm_page *));
 boolean_t	pmap_clear_reference4m __P((struct vm_page *));
-#else
-void		pmap_clear_modify4m __P((paddr_t pa));
-void		pmap_clear_reference4m __P((paddr_t pa));
-#endif
 void		pmap_copy_page4m __P((paddr_t, paddr_t));
 void		pmap_enter4m __P((pmap_t, vaddr_t, paddr_t, vm_prot_t,
 				  boolean_t, vm_prot_t));
 boolean_t	pmap_extract4m __P((pmap_t, vaddr_t, paddr_t *));
-#ifdef PMAP_NEW
 boolean_t	pmap_is_modified4m __P((struct vm_page *));
 boolean_t	pmap_is_referenced4m __P((struct vm_page *));
 void		pmap_kenter_pa4m __P((vaddr_t, paddr_t, vm_prot_t));
 void		pmap_kenter_pgs4m __P((vaddr_t, struct vm_page **, int));
 void		pmap_kremove4m __P((vaddr_t, vsize_t));
 void		pmap_page_protect4m __P((struct vm_page *, vm_prot_t));
-#else
-boolean_t	pmap_is_modified4m __P((paddr_t pa));
-boolean_t	pmap_is_referenced4m __P((paddr_t pa));
-void		pmap_page_protect4m __P((paddr_t, vm_prot_t));
-#endif
 void		pmap_protect4m __P((pmap_t, vaddr_t, vaddr_t, vm_prot_t));
 void		pmap_zero_page4m __P((paddr_t));
 void		pmap_changeprot4m __P((pmap_t, vaddr_t, vm_prot_t, int));
@@ -411,18 +385,12 @@ void		pmap_changeprot4m __P((pmap_t, vaddr_t, vm_prot_t, int));
 
 #else  /* must use function pointers */
 
-#ifdef PMAP_NEW
 extern boolean_t	(*pmap_clear_modify_p) __P((struct vm_page *));
 extern boolean_t	(*pmap_clear_reference_p) __P((struct vm_page *));
-#else
-extern void		(*pmap_clear_modify_p) __P((paddr_t pa));
-extern void		(*pmap_clear_reference_p) __P((paddr_t pa));
-#endif
 extern void		(*pmap_copy_page_p) __P((paddr_t, paddr_t));
 extern void		(*pmap_enter_p) __P((pmap_t, vaddr_t, paddr_t,
 					     vm_prot_t, boolean_t, vm_prot_t));
 extern boolean_t	(*pmap_extract_p) __P((pmap_t, vaddr_t, paddr_t *));
-#ifdef PMAP_NEW
 extern boolean_t	(*pmap_is_modified_p) __P((struct vm_page *));
 extern boolean_t	(*pmap_is_referenced_p) __P((struct vm_page *));
 extern void		(*pmap_kenter_pa_p) __P((vaddr_t, paddr_t, vm_prot_t));
@@ -431,11 +399,6 @@ extern void		(*pmap_kenter_pgs_p) __P((vaddr_t, struct vm_page **,
 extern void		(*pmap_kremove_p) __P((vaddr_t, vsize_t));
 extern void		(*pmap_page_protect_p) __P((struct vm_page *, 
 						    vm_prot_t));
-#else
-extern boolean_t	(*pmap_is_modified_p) __P((paddr_t pa));
-extern boolean_t	(*pmap_is_referenced_p) __P((paddr_t pa));
-extern void		(*pmap_page_protect_p) __P((paddr_t, vm_prot_t));
-#endif
 extern void		(*pmap_protect_p) __P((pmap_t, vaddr_t, vaddr_t,
 					       vm_prot_t));
 extern void		(*pmap_zero_page_p) __P((paddr_t));