From owner-svn-src-user@FreeBSD.ORG  Mon Apr  5 21:36:04 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 6D220106566B;
	Mon,  5 Apr 2010 21:36:04 +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 5D7528FC1D;
	Mon,  5 Apr 2010 21:36:04 +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 o35La4A1051254;
	Mon, 5 Apr 2010 21:36:04 GMT (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o35La4ao051252;
	Mon, 5 Apr 2010 21:36:04 GMT (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201004052136.o35La4ao051252@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Mon, 5 Apr 2010 21:36:04 +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: r206214 - 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, 05 Apr 2010 21:36:04 -0000

Author: jmallett
Date: Mon Apr  5 21:36:04 2010
New Revision: 206214
URL: http://svn.freebsd.org/changeset/base/206214

Log:
  Don't duplicate NBSEG as MIPS_SEGSIZE.

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  5 21:33:33 2010	(r206213)
+++ user/jmallett/octeon/sys/mips/mips/pmap.c	Mon Apr  5 21:36:04 2010	(r206214)
@@ -124,8 +124,7 @@ __FBSDID("$FreeBSD$");
 #define	segtab_pde(m, v)	((m)[pmap_segshift((v))])
 
 #define	NUSERPGTBLS		(pmap_segshift(VM_MAXUSER_ADDRESS))
-#define	MIPS_SEGSIZE		(1L << SEGSHIFT)
-#define	mips_segtrunc(va)	((va) & ~(MIPS_SEGSIZE-1))
+#define	mips_segtrunc(va)	((va) & ~SEGOFSET)
 #define	is_kernel_pmap(x)	((x) == kernel_pmap)
 
 struct pmap kernel_pmap_store;
@@ -1655,7 +1654,7 @@ pmap_remove(struct pmap *pmap, vm_offset
 	}
 	for (va = sva; va < eva; va = nva) {
 		if (!*pmap_pde(pmap, va)) {
-			nva = mips_segtrunc(va + MIPS_SEGSIZE);
+			nva = mips_segtrunc(va + NBSEG);
 			continue;
 		}
 		pmap_remove_page(pmap, va);
@@ -1771,7 +1770,7 @@ pmap_protect(pmap_t pmap, vm_offset_t sv
 		 * If segment table entry is empty, skip this segment.
 		 */
 		if (!*pmap_pde(pmap, sva)) {
-			sva = mips_segtrunc(sva + MIPS_SEGSIZE);
+			sva = mips_segtrunc(sva + NBSEG);
 			continue;
 		}
 		/*