From owner-svn-src-all@FreeBSD.ORG  Mon Jun 25 17:50:12 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 428D21065674;
	Mon, 25 Jun 2012 17:50:12 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2E4B38FC18;
	Mon, 25 Jun 2012 17:50:12 +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 q5PHoCXM086905;
	Mon, 25 Jun 2012 17:50:12 GMT (envelope-from gonzo@svn.freebsd.org)
Received: (from gonzo@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5PHoBIi086903;
	Mon, 25 Jun 2012 17:50:11 GMT (envelope-from gonzo@svn.freebsd.org)
Message-Id: <201206251750.q5PHoBIi086903@svn.freebsd.org>
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Mon, 25 Jun 2012 17:50:11 +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: r237566 - head/sys/mips/mips
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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, 25 Jun 2012 17:50:12 -0000

Author: gonzo
Date: Mon Jun 25 17:50:11 2012
New Revision: 237566
URL: http://svn.freebsd.org/changeset/base/237566

Log:
  Handle case when result of pmap_pte is NULL. This issue was uncovered
      by r237367

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

Modified: head/sys/mips/mips/pmap.c
==============================================================================
--- head/sys/mips/mips/pmap.c	Mon Jun 25 17:15:09 2012	(r237565)
+++ head/sys/mips/mips/pmap.c	Mon Jun 25 17:50:11 2012	(r237566)
@@ -765,6 +765,7 @@ pmap_extract(pmap_t pmap, vm_offset_t va
 vm_page_t
 pmap_extract_and_hold(pmap_t pmap, vm_offset_t va, vm_prot_t prot)
 {
+	pt_entry_t *ptep;
 	pt_entry_t pte;
 	vm_page_t m;
 	vm_paddr_t pa;
@@ -773,8 +774,9 @@ pmap_extract_and_hold(pmap_t pmap, vm_of
 	pa = 0;
 	PMAP_LOCK(pmap);
 retry:
-	pte = *pmap_pte(pmap, va);
-	if (pte != 0 && pte_test(&pte, PTE_V) &&
+	ptep = pmap_pte(pmap, va);
+	if ((ptep != NULL)  && ((pte = *ptep) != 0) && 
+	    pte_test(&pte, PTE_V) &&
 	    (pte_test(&pte, PTE_D) || (prot & VM_PROT_WRITE) == 0)) {
 		if (vm_page_pa_tryrelock(pmap, TLBLO_PTE_TO_PA(pte), &pa))
 			goto retry;