Remove orphaned debug code.

3 files changed, 3 insertions, 56 deletions

diff --git a/sys/arch/arm/arm/pmap.c b/sys/arch/arm/arm/pmap.c
index d8b34fecd45..79eef3c2f39 100644
--- a/sys/arch/arm/arm/pmap.c
+++ b/sys/arch/arm/arm/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.53 2015/02/07 01:46:27 kettenis Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.54 2015/08/15 22:20:20 miod Exp $	*/
 /*	$NetBSD: pmap.c,v 1.147 2004/01/18 13:03:50 scw Exp $	*/
 
 /*
@@ -175,11 +175,6 @@
  *       in a significant slow-down if both processes are in tight loops.
  */
 
-/*
- * Special compilation symbols
- * PMAP_DEBUG		- Build in pmap_debug_level code
- */
-
 /* Include header files */
 
 #include <sys/types.h>
@@ -202,12 +197,6 @@
 
 #ifdef PMAP_DEBUG
 
-/* XXX need to get rid of all refs to this */
-int pmap_debug_level = 0;
-
-/*
- * for switching to potentially finer grained debugging
- */
 #define	PDB_FOLLOW	0x0001
 #define	PDB_INIT	0x0002
 #define	PDB_ENTER	0x0004
@@ -227,7 +216,6 @@ int pmap_debug_level = 0;
 #define	PDB_KENTER	0x20000
 #define	PDB_KREMOVE	0x40000
 
-int debugmap = 1;
 int pmapdebug = PDB_ENTER|PDB_PVDUMP; 
 #define	NPDEBUG(_lev_,_stat_) \
 	if (pmapdebug & (_lev_)) \
@@ -475,17 +463,6 @@ vaddr_t pmap_curmaxkvaddr;
 
 extern pv_addr_t systempage;
 
-/* Function to set the debug level of the pmap code */
-
-#ifdef PMAP_DEBUG
-void
-pmap_debug(int level)
-{
-	pmap_debug_level = level;
-	printf("pmap_debug: level=%d\n", pmap_debug_level);
-}
-#endif	/* PMAP_DEBUG */
-
 /*
  * A bunch of routines to conditionally flush the caches/TLB depending
  * on whether the specified pmap actually needs to be flushed at any
diff --git a/sys/arch/arm/arm/vm_machdep.c b/sys/arch/arm/arm/vm_machdep.c
index 5e127281422..06f217b7189 100644
--- a/sys/arch/arm/arm/vm_machdep.c
+++ b/sys/arch/arm/arm/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_machdep.c,v 1.15 2015/05/05 02:13:46 guenther Exp $	*/
+/*	$OpenBSD: vm_machdep.c,v 1.16 2015/08/15 22:20:20 miod Exp $	*/
 /*	$NetBSD: vm_machdep.c,v 1.31 2004/01/04 11:33:29 jdolecek Exp $	*/
 
 /*
@@ -108,11 +108,6 @@ cpu_fork(p1, p2, stack, stacksize, func, arg)
 	struct trapframe *tf;
 	struct switchframe *sf;
 
-#ifdef PMAP_DEBUG
-	if (pmap_debug_level >= 0)
-		printf("cpu_fork: %p %p %p\n", p1, p2, &proc0);
-#endif	/* PMAP_DEBUG */
-
 	if (p1 == curproc) {
 		/* Sync the PCB before we copy it. */
 		savectx(curpcb);
@@ -138,17 +133,6 @@ cpu_fork(p1, p2, stack, stacksize, func, arg)
 	    (USPACE_SVC_STACK_TOP - USPACE_SVC_STACK_BOTTOM));
 #endif	/* STACKCHECKS */
 
-#ifdef PMAP_DEBUG
-	if (pmap_debug_level >= 0) {
-		printf("p1->procaddr=%p p1->procaddr->u_pcb=%p pid=%d pmap=%p\n",
-		    p1->p_addr, &p1->p_addr->u_pcb, p1->p_pid,
-		    p1->p_vmspace->vm_map.pmap);
-		printf("p2->procaddr=%p p2->procaddr->u_pcb=%p pid=%d pmap=%p\n",
-		    p2->p_addr, &p2->p_addr->u_pcb, p2->p_pid,
-		    p2->p_vmspace->vm_map.pmap);
-	}
-#endif	/* PMAP_DEBUG */
-
 	pmap_activate(p2);
 
 	p2->p_addr->u_pcb.pcb_tf = tf =
@@ -189,12 +173,6 @@ vmapbuf(bp, len)
 	paddr_t fpa;
 
 
-#ifdef PMAP_DEBUG
-	if (pmap_debug_level >= 0)
-		printf("vmapbuf: bp=%08x buf=%08x len=%08x\n", (u_int)bp,
-		    (u_int)bp->b_data, (u_int)len);
-#endif	/* PMAP_DEBUG */
-    
 	if ((bp->b_flags & B_PHYS) == 0)
 		panic("vmapbuf");
 
@@ -231,12 +209,6 @@ vunmapbuf(bp, len)
 {
 	vaddr_t addr, off;
 
-#ifdef PMAP_DEBUG
-	if (pmap_debug_level >= 0)
-		printf("vunmapbuf: bp=%08x buf=%08x len=%08x\n",
-		    (u_int)bp, (u_int)bp->b_data, (u_int)len);
-#endif	/* PMAP_DEBUG */
-
 	if ((bp->b_flags & B_PHYS) == 0)
 		panic("vunmapbuf");
 
diff --git a/sys/arch/arm/include/pmap.h b/sys/arch/arm/include/pmap.h
index 384130dd01f..e5d3cd4ef3b 100644
--- a/sys/arch/arm/include/pmap.h
+++ b/sys/arch/arm/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.33 2015/06/24 21:26:04 miod Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.34 2015/08/15 22:20:20 miod Exp $	*/
 /*	$NetBSD: pmap.h,v 1.76 2003/09/06 09:10:46 rearnsha Exp $	*/
 
 /*
@@ -225,7 +225,6 @@ typedef struct pv_addr {
  * Commonly referenced structures
  */
 extern struct pmap	kernel_pmap_store;
-extern int		pmap_debug_level; /* Only exists if PMAP_DEBUG */
 
 /*
  * Macros that we need to export
@@ -261,7 +260,6 @@ boolean_t pmap_get_pde_pte(pmap_t, vaddr_t, pd_entry_t **, pt_entry_t **);
 boolean_t pmap_get_pde(pmap_t, vaddr_t, pd_entry_t **);
 void	pmap_set_pcb_pagedir(pmap_t, struct pcb *);
 
-void	pmap_debug(int);
 void	pmap_postinit(void);
 
 void	vector_page_setprot(int);