From owner-svn-src-user@FreeBSD.ORG  Fri Apr  2 06:41:46 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 419331065670;
	Fri,  2 Apr 2010 06:41:46 +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 311158FC0A;
	Fri,  2 Apr 2010 06:41:46 +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 o326fkx4076829;
	Fri, 2 Apr 2010 06:41:46 GMT (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o326fktv076827;
	Fri, 2 Apr 2010 06:41:46 GMT (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201004020641.o326fktv076827@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Fri, 2 Apr 2010 06:41:46 +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: r206080 - 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: Fri, 02 Apr 2010 06:41:46 -0000

Author: jmallett
Date: Fri Apr  2 06:41:45 2010
New Revision: 206080
URL: http://svn.freebsd.org/changeset/base/206080

Log:
  Fix a SEGSHIFT use for N64.

Modified:
  user/jmallett/octeon/sys/mips/mips/exception.S

Modified: user/jmallett/octeon/sys/mips/mips/exception.S
==============================================================================
--- user/jmallett/octeon/sys/mips/mips/exception.S	Fri Apr  2 06:24:16 2010	(r206079)
+++ user/jmallett/octeon/sys/mips/mips/exception.S	Fri Apr  2 06:41:45 2010	(r206080)
@@ -126,7 +126,11 @@ VECTOR_END(MipsTLBMiss)
 	.set noat
 MipsDoTLBMiss:
 	bltz		k0, 1f				#02: k0<0 -> 1f (kernel fault)
-	srl		k0, k0, SEGSHIFT - 2		#03: k0=seg offset (almost)
+#if defined(__mips_n64)
+	PTR_SRL		k0, k0, SEGSHIFT - 3		#03: k0=seg offset (almost)
+#else
+	PTR_SRL		k0, k0, SEGSHIFT - 2		#03: k0=seg offset (almost)
+#endif
 
 	GET_CPU_PCPU(k1)
 	PTR_L		k1, PC_SEGBASE(k1)