From owner-svn-src-all@FreeBSD.ORG  Mon Aug 19 15:36:24 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 3464354D;
 Mon, 19 Aug 2013 15:36:24 +0000 (UTC) (envelope-from raj@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 21421262E;
 Mon, 19 Aug 2013 15:36:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7JFaNBu014366;
 Mon, 19 Aug 2013 15:36:23 GMT (envelope-from raj@svn.freebsd.org)
Received: (from raj@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7JFaNek014365;
 Mon, 19 Aug 2013 15:36:23 GMT (envelope-from raj@svn.freebsd.org)
Message-Id: <201308191536.r7JFaNek014365@svn.freebsd.org>
From: Rafal Jaworowski <raj@FreeBSD.org>
Date: Mon, 19 Aug 2013 15:36:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r254533 - head/sys/arm/arm
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Aug 2013 15:36:24 -0000

Author: raj
Date: Mon Aug 19 15:36:23 2013
New Revision: 254533
URL: http://svnweb.freebsd.org/changeset/base/254533

Log:
  Fix ARMv6/v7 mapping's wired status.
  
  Last input argument in pmap_modify_pv() should be a mask of flags to be set.
  In pmap_change_wiring() however, the straight wired status was used, which
  does not represent valid flags (and is of type boolean).
  
  This commit fixes the issue so that wired flag is passed to pmap_modify_pv()
  properly.
  
  Submitted by:	Zbigniew Bodek <zbb@semihalf.com>
  Reviewed by:	gber
  Sponsored by:	The FreeBSD Foundation, Semihalf

Modified:
  head/sys/arm/arm/pmap-v6.c

Modified: head/sys/arm/arm/pmap-v6.c
==============================================================================
--- head/sys/arm/arm/pmap-v6.c	Mon Aug 19 15:12:36 2013	(r254532)
+++ head/sys/arm/arm/pmap-v6.c	Mon Aug 19 15:36:23 2013	(r254533)
@@ -2932,7 +2932,8 @@ pmap_change_wiring(pmap_t pmap, vm_offse
 	pte = *ptep;
 	m = PHYS_TO_VM_PAGE(l2pte_pa(pte));
 	if (m != NULL)
-		pmap_modify_pv(m, pmap, va, PVF_WIRED, wired);
+		pmap_modify_pv(m, pmap, va, PVF_WIRED,
+		    wired == TRUE ? PVF_WIRED : 0);
 	rw_wunlock(&pvh_global_lock);
 	PMAP_UNLOCK(pmap);
 }