From owner-svn-src-all@FreeBSD.ORG  Mon Apr  2 11:41:33 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DD52B1065674;
	Mon,  2 Apr 2012 11:41:33 +0000 (UTC)
	(envelope-from jchandra@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C8C508FC1E;
	Mon,  2 Apr 2012 11:41:33 +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 q32BfXqC096472;
	Mon, 2 Apr 2012 11:41:33 GMT (envelope-from jchandra@svn.freebsd.org)
Received: (from jchandra@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q32BfXuC096470;
	Mon, 2 Apr 2012 11:41:33 GMT (envelope-from jchandra@svn.freebsd.org)
Message-Id: <201204021141.q32BfXuC096470@svn.freebsd.org>
From: "Jayachandran C." <jchandra@FreeBSD.org>
Date: Mon, 2 Apr 2012 11:41:33 +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: r233776 - 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, 02 Apr 2012 11:41:34 -0000

Author: jchandra
Date: Mon Apr  2 11:41:33 2012
New Revision: 233776
URL: http://svn.freebsd.org/changeset/base/233776

Log:
  Reinstate the XTLB handler for CPU_NLM and CPU_RMI
  
  These platforms set the KX bit even when booted in 32 bit mode. So
  the XLTB handler is needed even when __mips_n64 is not defined.

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

Modified: head/sys/mips/mips/machdep.c
==============================================================================
--- head/sys/mips/mips/machdep.c	Mon Apr  2 11:27:20 2012	(r233775)
+++ head/sys/mips/mips/machdep.c	Mon Apr  2 11:41:33 2012	(r233776)
@@ -346,7 +346,7 @@ mips_vector_init(void)
 	bcopy(MipsTLBMiss, (void *)MIPS_UTLB_MISS_EXC_VEC,
 	      MipsTLBMissEnd - MipsTLBMiss);
 
-#ifdef __mips_n64
+#if defined(__mips_n64) || defined(CPU_RMI) || defined(CPU_NLM)
 	bcopy(MipsTLBMiss, (void *)MIPS_XTLB_MISS_EXC_VEC,
 	      MipsTLBMissEnd - MipsTLBMiss);
 #endif