Spring pmap cleaning:

- update and fix comments
- clean the batc code (still not used by default)
- there was some KNF left to do
- fix incorrect locking behaviour in pmap_remove_all()
- fix incorrect pmap_remove_range() call which would cause the kernel to
  enter an infinite loop sometimes at shutdown
- fix an off-by-one page loop in pmap_protect()

This should bring the extra bits of stability I need to resume working on the
compiler...

1 files changed, 9 insertions, 10 deletions

diff --git a/sys/arch/mvme88k/include/pmap.h b/sys/arch/mvme88k/include/pmap.h
index 71b0a667478..39ede11061d 100644
--- a/sys/arch/mvme88k/include/pmap.h
+++ b/sys/arch/mvme88k/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.26 2002/03/14 01:26:39 millert Exp $ */
+/*	$OpenBSD: pmap.h,v 1.27 2002/05/07 00:54:34 miod Exp $ */
 /*
  * Mach Operating System
  * Copyright (c) 1991 Carnegie Mellon University
@@ -14,7 +14,6 @@
  */
 #ifndef _MACHINE_PMAP_H_
 #define _MACHINE_PMAP_H_
-#define OMRON_PMAP
 
 #include <machine/mmu.h>		/* batc_template_t, BATC_MAX, etc.*/
 #include <machine/pcb.h>		/* pcb_t, etc.*/
@@ -27,6 +26,7 @@ typedef sdt_entry_t *sdt_ptr_t;
  */
 typedef struct pmap *pmap_t;
 
+/* #define PMAP_USE_BATC */
 struct pmap {
 	sdt_ptr_t		sdt_paddr;	/* physical pointer to sdt */
 	sdt_ptr_t		sdt_vaddr;	/* virtual pointer to sdt */
@@ -37,16 +37,15 @@ struct pmap {
 	/* cpus using of this pmap; NCPU must be <= 32 */
 	u_int32_t		cpus_using;
 
-#ifdef DEBUG
-	pmap_t			next;
-	pmap_t			prev;
-#endif
-
-	/* for OMRON_PMAP */
+#ifdef	PMAP_USE_BATC
 	batc_template_t		i_batc[BATC_MAX];	/* instruction BATCs */
 	batc_template_t		d_batc[BATC_MAX];	/* data BATCs */
-	/* end OMRON_PMAP */
+#endif
 
+#ifdef	DEBUG
+	pmap_t			next;
+	pmap_t			prev;
+#endif
 }; 
 
 #define PMAP_NULL ((pmap_t) 0)
@@ -81,7 +80,7 @@ extern	caddr_t		vmmap;
 #define PMAP_DEACTIVATE(proc)	pmap_deactivate(proc)
 
 void pmap_bootstrap(vaddr_t, paddr_t *, paddr_t *, vaddr_t *, vaddr_t *);
-void pmap_cache_ctrl(pmap_t, vaddr_t, vaddr_t, unsigned);
+void pmap_cache_ctrl(pmap_t, vaddr_t, vaddr_t, u_int);
 
 #endif	/* _KERNEL */