Module Name:    src
Committed By:   matt
Date:           Sun Mar 30 15:55:08 UTC 2014

Modified Files:
        src/sys/arch/arm/arm32: pmap.c

Log Message:
Fix debug code in fault_fixup


To generate a diff of this commit:
cvs rdiff -u -r1.271 -r1.272 src/sys/arch/arm/arm32/pmap.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/arm/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.271 src/sys/arch/arm/arm32/pmap.c:1.272
--- src/sys/arch/arm/arm32/pmap.c:1.271	Sun Mar 30 15:50:51 2014
+++ src/sys/arch/arm/arm32/pmap.c	Sun Mar 30 15:55:08 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.271 2014/03/30 15:50:51 matt Exp $	*/
+/*	$NetBSD: pmap.c,v 1.272 2014/03/30 15:55:08 matt Exp $	*/
 
 /*
  * Copyright 2003 Wasabi Systems, Inc.
@@ -216,7 +216,7 @@
 #include <arm/locore.h>
 //#include <arm/arm32/katelib.h>
 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.271 2014/03/30 15:50:51 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.272 2014/03/30 15:55:08 matt Exp $");
 
 //#define PMAP_DEBUG
 #ifdef PMAP_DEBUG
@@ -4572,13 +4572,16 @@ pmap_fault_fixup(pmap_t pm, vaddr_t va, 
 #endif
 #endif
 #ifdef DDB
-		//extern int kernel_debug;
+		extern int kernel_debug;
 
-		//if (kernel_debug & 2)
-		pmap_release_pmap_lock(pm);
-		KERNHIST_DUMP(maphist);
+		if (kernel_debug & 2) {
+			pmap_release_pmap_lock(pm);
+#ifdef UVMHIST
+			KERNHIST_DUMP(maphist);
+#endif
 			cpu_Debugger();
-		pmap_acquire_pmap_lock(pm);
+			pmap_acquire_pmap_lock(pm);
+		}
 #endif
 	}
 #endif

Reply via email to