From owner-svn-src-stable@FreeBSD.ORG  Sun Mar  8 16:19:30 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 29DEC106566B;
	Sun,  8 Mar 2009 16:19:30 +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 16F028FC08;
	Sun,  8 Mar 2009 16:19:30 +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 n28GJTeV087551;
	Sun, 8 Mar 2009 16:19:29 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n28GJTxT087550;
	Sun, 8 Mar 2009 16:19:29 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <200903081619.n28GJTxT087550@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sun, 8 Mar 2009 16:19:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r189536 - stable/7/sys/powerpc/powerpc
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Mar 2009 16:19:30 -0000

Author: nwhitehorn
Date: Sun Mar  8 16:19:29 2009
New Revision: 189536
URL: http://svn.freebsd.org/changeset/base/189536

Log:
  Fix a mismerge from head that I somehow missed last night. This caused builds with
  KDB enabled to fail.
  
  Pointy hat to: 	me

Modified:
  stable/7/sys/powerpc/powerpc/trap_subr.S

Modified: stable/7/sys/powerpc/powerpc/trap_subr.S
==============================================================================
--- stable/7/sys/powerpc/powerpc/trap_subr.S	Sun Mar  8 16:16:55 2009	(r189535)
+++ stable/7/sys/powerpc/powerpc/trap_subr.S	Sun Mar  8 16:19:29 2009	(r189536)
@@ -515,12 +515,9 @@ CNAME(ppc_db_trap):
  */
 dbtrap:
 	/* Write the trap vector to SPRG3 by computing LR & 0xff00 */
-	mflr	%r1
-	andi.	%r1,%r1,0xff00
-	mtsprg3	%r1
-
-	lis	%r1,(tmpstk+TMPSTKSZ-16)@ha	/* get new SP */
-	addi	%r1,%r1,(tmpstk+TMPSTKSZ-16)@l
+	mflr	%r31
+	andi.	%r31,%r31,0xff00
+	mtsprg3	%r31
 
 	FRAME_SETUP(PC_DBSAVE)
 /* Call C trap code: */