From owner-svn-src-user@FreeBSD.ORG  Wed Jul  7 10:55:13 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 AB22F106566B;
	Wed,  7 Jul 2010 10:55:13 +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 9ADB48FC36;
	Wed,  7 Jul 2010 10:55:13 +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 o67AtD1I068656;
	Wed, 7 Jul 2010 10:55:13 GMT (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o67AtDAj068654;
	Wed, 7 Jul 2010 10:55:13 GMT (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201007071055.o67AtDAj068654@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Wed, 7 Jul 2010 10:55:13 +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: r209759 - user/jmallett/octeon/sys/mips/include
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: Wed, 07 Jul 2010 10:55:13 -0000

Author: jmallett
Date: Wed Jul  7 10:55:13 2010
New Revision: 209759
URL: http://svn.freebsd.org/changeset/base/209759

Log:
  Fix typo from hand-merge.

Modified:
  user/jmallett/octeon/sys/mips/include/pte.h

Modified: user/jmallett/octeon/sys/mips/include/pte.h
==============================================================================
--- user/jmallett/octeon/sys/mips/include/pte.h	Wed Jul  7 09:23:46 2010	(r209758)
+++ user/jmallett/octeon/sys/mips/include/pte.h	Wed Jul  7 10:55:13 2010	(r209759)
@@ -101,7 +101,7 @@ typedef	pt_entry_t *pd_entry_t;
 				 (TLBHI_VA_TO_VPN2((va))) /* VPN2. */ | \
 				 ((asid) & TLBHI_ASID_MASK))
 #else
-#define	TLBHI_ENTRY(va, asid)	(((va) & ~(1 << TLBHI_VPN2_SHIFT)) | ((asid) & TLBHI_ASID_MASK))
+#define	TLBHI_ENTRY(va, asid)	(((va) & ~((1ULL << TLBHI_VPN2_SHIFT) - 1)) | ((asid) & TLBHI_ASID_MASK))
 #endif
 
 /*