Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 21 Feb 2019 22:56:54 +0000 (UTC)
From:      Mark Johnston <markj@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r344453 - head/sys/cddl/contrib/opensolaris/uts/intel/dtrace
Message-ID:  <201902212256.x1LMusof020859@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: markj
Date: Thu Feb 21 22:56:54 2019
New Revision: 344453
URL: https://svnweb.freebsd.org/changeset/base/344453

Log:
  Commit a missing piece of r344452.
  
  MFC with:	r344452

Modified:
  head/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c

Modified: head/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c	Thu Feb 21 22:54:17 2019	(r344452)
+++ head/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c	Thu Feb 21 22:56:54 2019	(r344453)
@@ -1080,7 +1080,11 @@ fasttrap_pid_probe(struct trapframe *tf)
 			 * been removed, and retry the instruction.
 			 */
 			curthread->t_fasttrap_tp_gen = gen;
+#ifdef __amd64
 			tf->tf_rip = pc;
+#else
+			tf->tf_eip = pc;
+#endif
 			return (0);
 		}
 		return (-1);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902212256.x1LMusof020859>