svn commit: r335507 - stable/11/sys/amd64/linux

[Konstantin Belousov]

Author: kib
Date: Thu Jun 21 21:19:48 2018
New Revision: 335507
URL: https://svnweb.freebsd.org/changeset/base/335507

Log:
  MFC r335135:
  linuxolator/amd64: Don't mangle %r10 on return from syscall for EJUSTRETURN.

Modified:
  stable/11/sys/amd64/linux/linux_sysvec.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/amd64/linux/linux_sysvec.c
==============================================================================
--- stable/11/sys/amd64/linux/linux_sysvec.c	Thu Jun 21 21:16:26 2018	(r335506)
+++ stable/11/sys/amd64/linux/linux_sysvec.c	Thu Jun 21 21:19:48 2018	(r335507)
@@ -257,7 +257,8 @@ linux_set_syscall_retval(struct thread *td, int error)
 	 * So, do not clobber %rdx and %r10
 	 */
 	td->td_retval[1] = frame->tf_rdx;
-	frame->tf_r10 = frame->tf_rcx;
+	if (error != EJUSTRETURN)
+		frame->tf_r10 = frame->tf_rcx;
 
 	cpu_set_syscall_retval(td, error);