svn commit: r339988 - head/sys/arm64/arm64

[Andrew Turner]

Author: andrew
Date: Thu Nov  1 10:25:22 2018
New Revision: 339988
URL: https://svnweb.freebsd.org/changeset/base/339988

Log:
  Use the correct offsets for the trap frame in fork_trampoline.
  
  Sponsored by:	DARPA, AFRL

Modified:
  head/sys/arm64/arm64/swtch.S

Modified: head/sys/arm64/arm64/swtch.S
==============================================================================
--- head/sys/arm64/arm64/swtch.S	Thu Nov  1 09:00:37 2018	(r339987)
+++ head/sys/arm64/arm64/swtch.S	Thu Nov  1 10:25:22 2018	(r339988)
@@ -236,12 +236,12 @@ ENTRY(fork_trampoline)
 	msr	daifset, #2
 
 	/* Restore sp and lr */
-	ldp	x0, x1, [sp]
+	ldp	x0, x1, [sp, #TF_SP]
 	msr	sp_el0, x0
 	mov	lr, x1
 
 	/* Restore elr and spsr */
-	ldp	x0, x1, [sp, #16]
+	ldp	x0, x1, [sp, #TF_ELR]
 	msr	elr_el1, x0
 	msr	spsr_el1, x1