From owner-svn-src-user@FreeBSD.ORG  Mon Apr 19 06:58:57 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0553C1065677;
	Mon, 19 Apr 2010 06:58:57 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CEA818FC24;
	Mon, 19 Apr 2010 06:58:56 +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 o3J6wu8T025797;
	Mon, 19 Apr 2010 06:58:56 GMT
	(envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3J6wuPt025795;
	Mon, 19 Apr 2010 06:58:56 GMT
	(envelope-from jmallett@svn.freebsd.org)
Message-Id: <201004190658.o3J6wuPt025795@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Mon, 19 Apr 2010 06:58:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r206832 - user/jmallett/octeon/sys/mips/mips
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Apr 2010 06:58:57 -0000

Author: jmallett
Date: Mon Apr 19 06:58:56 2010
New Revision: 206832
URL: http://svn.freebsd.org/changeset/base/206832

Log:
  Eliminate the gratuitous pmap_pde() macro.

Modified:
  user/jmallett/octeon/sys/mips/mips/pmap.c

Modified: user/jmallett/octeon/sys/mips/mips/pmap.c
==============================================================================
--- user/jmallett/octeon/sys/mips/mips/pmap.c	Mon Apr 19 06:58:31 2010	(r206831)
+++ user/jmallett/octeon/sys/mips/mips/pmap.c	Mon Apr 19 06:58:56 2010	(r206832)
@@ -125,7 +125,6 @@ __FBSDID("$FreeBSD$");
  *     so we end up getting NUSERPGTBLS of 0.
  */
 #define	pmap_segshift(v)	(((v) >> SEGSHIFT) & (NPDEPG - 1))
-#define	pmap_pde(m, v)		(&((m)->pm_segtab[pmap_segshift((v))]))
 #define	segtab_pde(m, v)	((m)[pmap_segshift((v))])
 
 #if defined(__mips_n64)
@@ -272,10 +271,10 @@ caddr_t virtual_sys_start = (caddr_t)0;
 static inline pt_entry_t *
 pmap_segmap(pmap_t pmap, vm_offset_t va)
 {
-	if (pmap->pm_segtab)
-		return (*pmap_pde(pmap, va));
+	if (pmap->pm_segtab != NULL)
+		return (segtab_pde(pmap->pm_segtab, va));
 	else
-		return ((pd_entry_t)0);
+		return (NULL);
 }
 
 /*
@@ -912,7 +911,7 @@ pmap_unuse_pt(pmap_t pmap, vm_offset_t v
 		    (pmap->pm_ptphint->pindex == ptepindex)) {
 			mpte = pmap->pm_ptphint;
 		} else {
-			pteva = *pmap_pde(pmap, va);
+			pteva = pmap_segmap(pmap, va);
 			mpte = PHYS_TO_VM_PAGE(vtophys(pteva));
 			pmap->pm_ptphint = mpte;
 		}
@@ -1558,7 +1557,7 @@ pmap_remove(struct pmap *pmap, vm_offset
 		goto out;
 	}
 	for (va = sva; va < eva; va = nva) {
-		if (!*pmap_pde(pmap, va)) {
+		if (pmap_segmap(pmap, va) == NULL) {
 			nva = mips_segtrunc(va + NBSEG);
 			continue;
 		}
@@ -1666,7 +1665,7 @@ pmap_protect(pmap_t pmap, vm_offset_t sv
 		/*
 		 * If segment table entry is empty, skip this segment.
 		 */
-		if (!*pmap_pde(pmap, sva)) {
+		if (pmap_segmap(pmap, sva) == NULL) {
 			sva = mips_segtrunc(sva + NBSEG);
 			continue;
 		}
@@ -2611,7 +2610,7 @@ pmap_is_prefaultable(pmap_t pmap, vm_off
 
 	rv = FALSE;
 	PMAP_LOCK(pmap);
-	if (*pmap_pde(pmap, addr)) {
+	if (pmap_segmap(pmap, addr) != NULL) {
 		pte = pmap_pte(pmap, addr);
 		rv = (*pte == 0);
 	}