svn commit: r189536 - stable/7/sys/powerpc/powerpc

[Nathan Whitehorn]

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: */