From owner-svn-src-head@FreeBSD.ORG  Tue Jun  1 04:38:05 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 59174106564A;
	Tue,  1 Jun 2010 04:38:05 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 481CE8FC0A;
	Tue,  1 Jun 2010 04:38:05 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o514c5XE022458;
	Tue, 1 Jun 2010 04:38:05 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o514c5Pd022456;
	Tue, 1 Jun 2010 04:38:05 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <201006010438.o514c5Pd022456@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Tue, 1 Jun 2010 04:38:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r208686 - head/sys/mips/mips
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 01 Jun 2010 04:38:05 -0000

Author: alc
Date: Tue Jun  1 04:38:05 2010
New Revision: 208686
URL: http://svn.freebsd.org/changeset/base/208686

Log:
  Fix a KASSERT() that was broken in r208665.
  
  Reported by:	jmallett

Modified:
  head/sys/mips/mips/pmap.c

Modified: head/sys/mips/mips/pmap.c
==============================================================================
--- head/sys/mips/mips/pmap.c	Mon May 31 23:58:36 2010	(r208685)
+++ head/sys/mips/mips/pmap.c	Tue Jun  1 04:38:05 2010	(r208686)
@@ -1418,7 +1418,8 @@ pmap_pvh_free(struct md_page *pvh, pmap_
 
 	pv = pmap_pvh_remove(pvh, pmap, va);
 	KASSERT(pv != NULL, ("pmap_pvh_free: pv not found, pa %lx va %lx",
-	     (u_long)VM_PAGE_TO_PHYS(m), (u_long)va));
+	     (u_long)VM_PAGE_TO_PHYS(member2struct(vm_page, md, pvh)),
+	     (u_long)va));
 	free_pv_entry(pv);
 }