svn commit: r213666 - stable/7/sys/amd64/amd64

[Konstantin Belousov]

Author: kib
Date: Sun Oct 10 07:28:56 2010
New Revision: 213666
URL: http://svn.freebsd.org/changeset/base/213666

Log:
  MFC r213382:
  In makectx(), always use the tf_rsp from trap frame. %rsp is pushed
  unconditionally by hardware on the trap.
  
  PR:   amd64/151167

Modified:
  stable/7/sys/amd64/amd64/machdep.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/amd64/amd64/machdep.c
==============================================================================
--- stable/7/sys/amd64/amd64/machdep.c	Sun Oct 10 07:07:21 2010	(r213665)
+++ stable/7/sys/amd64/amd64/machdep.c	Sun Oct 10 07:28:56 2010	(r213666)
@@ -1443,7 +1443,7 @@ makectx(struct trapframe *tf, struct pcb
 	pcb->pcb_rbp = tf->tf_rbp;
 	pcb->pcb_rbx = tf->tf_rbx;
 	pcb->pcb_rip = tf->tf_rip;
-	pcb->pcb_rsp = (ISPL(tf->tf_cs)) ? tf->tf_rsp : (long)(tf + 1) - 8;
+	pcb->pcb_rsp = tf->tf_rsp;
 }
 
 int