svn commit: r234116 - stable/9/sys/powerpc/include

[Nathan Whitehorn]

Author: nwhitehorn
Date: Wed Apr 11 00:28:44 2012
New Revision: 234116
URL: http://svn.freebsd.org/changeset/base/234116

Log:
  MFC r233948:
  Give the kernel pmap lock a different name than user pmap locks. It has
  (slightly) different semantics and renaming it prevents a (harmless)
  WITNESS warning during bootup for 32-bit kernels on 64-bit CPUs.

Modified:
  stable/9/sys/powerpc/include/pmap.h
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/powerpc/include/pmap.h
==============================================================================
--- stable/9/sys/powerpc/include/pmap.h	Wed Apr 11 00:00:40 2012	(r234115)
+++ stable/9/sys/powerpc/include/pmap.h	Wed Apr 11 00:28:44 2012	(r234116)
@@ -212,8 +212,9 @@ extern	struct pmap kernel_pmap_store;
 #define	PMAP_LOCK_ASSERT(pmap, type) \
 				mtx_assert(&(pmap)->pm_mtx, (type))
 #define	PMAP_LOCK_DESTROY(pmap)	mtx_destroy(&(pmap)->pm_mtx)
-#define	PMAP_LOCK_INIT(pmap)	mtx_init(&(pmap)->pm_mtx, "pmap", \
-				    NULL, MTX_DEF)
+#define	PMAP_LOCK_INIT(pmap)	mtx_init(&(pmap)->pm_mtx, \
+				    (pmap == kernel_pmap) ? "kernelpmap" : \
+				    "pmap", NULL, MTX_DEF)
 #define	PMAP_LOCKED(pmap)	mtx_owned(&(pmap)->pm_mtx)
 #define	PMAP_MTX(pmap)		(&(pmap)->pm_mtx)
 #define	PMAP_TRYLOCK(pmap)	mtx_trylock(&(pmap)->pm_mtx)