Module Name: src
Committed By: matt
Date: Tue Mar 15 07:31:34 UTC 2011
Modified Files:
src/sys/arch/mips/mips: pmap.c
Log Message:
Make sure we do proper locking if LOCKDEBUG is defined
To generate a diff of this commit:
cvs rdiff -u -r1.197 -r1.198 src/sys/arch/mips/mips/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/mips/mips/pmap.c
diff -u src/sys/arch/mips/mips/pmap.c:1.197 src/sys/arch/mips/mips/pmap.c:1.198
--- src/sys/arch/mips/mips/pmap.c:1.197 Wed Mar 2 13:26:41 2011
+++ src/sys/arch/mips/mips/pmap.c Tue Mar 15 07:31:33 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.197 2011/03/02 13:26:41 tsutsui Exp $ */
+/* $NetBSD: pmap.c,v 1.198 2011/03/15 07:31:33 matt Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.197 2011/03/02 13:26:41 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.198 2011/03/15 07:31:33 matt Exp $");
/*
* Manages physical address maps.
@@ -2234,7 +2234,7 @@
pmap, va);
#endif
if (__predict_true(apv == NULL)) {
-#if defined(MULTIPROCESSOR) || !defined(_LP64) || defined(PMAP_POOLPAGE_DEBUG)
+#if defined(MULTIPROCESSOR) || !defined(_LP64) || defined(PMAP_POOLPAGE_DEBUG) || defined(LOCKDEBUG)
/*
* To allocate a PV, we have to release the PVLIST lock
* so get the page generation. We allocate the PV, and
@@ -2245,7 +2245,7 @@
apv = (pv_entry_t)pmap_pv_alloc();
if (apv == NULL)
panic("pmap_enter_pv: pmap_pv_alloc() failed");
-#if defined(MULTIPROCESSOR) || !defined(_LP64) || defined(PMAP_POOLPAGE_DEBUG)
+#if defined(MULTIPROCESSOR) || !defined(_LP64) || defined(PMAP_POOLPAGE_DEBUG) || defined(LOCKDEBUG)
#ifdef MULTIPROCESSOR
/*
* If the generation has changed, then someone else
