From owner-svn-src-stable@FreeBSD.ORG  Wed Apr 11 00:28:45 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 5B76A106566B;
	Wed, 11 Apr 2012 00:28:45 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 45FD98FC18;
	Wed, 11 Apr 2012 00:28:45 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3B0SjJm046938;
	Wed, 11 Apr 2012 00:28:45 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3B0SjVK046936;
	Wed, 11 Apr 2012 00:28:45 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201204110028.q3B0SjVK046936@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Wed, 11 Apr 2012 00:28:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234116 - stable/9/sys/powerpc/include
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Apr 2012 00:28:45 -0000

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)