From owner-svn-src-head@FreeBSD.ORG  Tue Apr 14 04:15:57 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 10ED1106566C;
	Tue, 14 Apr 2009 04:15:57 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 009D88FC12;
	Tue, 14 Apr 2009 04:15:57 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3E4FuED093746;
	Tue, 14 Apr 2009 04:15:56 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3E4FuXl093745;
	Tue, 14 Apr 2009 04:15:56 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <200904140415.n3E4FuXl093745@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Tue, 14 Apr 2009 04:15:56 +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: r191039 - head/sys/powerpc/aim
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 14 Apr 2009 04:15:57 -0000

Author: nwhitehorn
Date: Tue Apr 14 04:15:56 2009
New Revision: 191039
URL: http://svn.freebsd.org/changeset/base/191039

Log:
  Changing the overflow trap to use bla to branch to dbtrap in r190946 was
  bogus. Revert to a branch that does not set LR. It's been a long week...

Modified:
  head/sys/powerpc/aim/trap_subr.S

Modified: head/sys/powerpc/aim/trap_subr.S
==============================================================================
--- head/sys/powerpc/aim/trap_subr.S	Tue Apr 14 03:36:59 2009	(r191038)
+++ head/sys/powerpc/aim/trap_subr.S	Tue Apr 14 04:15:56 2009	(r191039)
@@ -460,7 +460,7 @@ disitrap:
 	stw	%r30,(PC_DBSAVE  +CPUSAVE_R30)(%r1) /* save r30 */
 	lwz	%r31,(PC_DISISAVE+CPUSAVE_R31)(%r1) /* get  r31 */
 	stw	%r31,(PC_DBSAVE  +CPUSAVE_R31)(%r1) /* save r31 */
-	bla	dbtrap
+	b	dbtrap
 #endif
 
 	/* XXX need stack probe here */