svn commit: r213665 - stable/8/sys/amd64/amd64

Konstantin Belousov kib at FreeBSD.org
Sun Oct 10 07:07:21 UTC 2010


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

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/8/sys/amd64/amd64/machdep.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/amd64/amd64/machdep.c
==============================================================================
--- stable/8/sys/amd64/amd64/machdep.c	Sun Oct 10 07:05:47 2010	(r213664)
+++ stable/8/sys/amd64/amd64/machdep.c	Sun Oct 10 07:07:21 2010	(r213665)
@@ -1795,7 +1795,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


More information about the svn-src-stable mailing list