diff options
| author | Andrew Turner <andrew@FreeBSD.org> | 2018-11-01 10:25:22 +0000 |
|---|---|---|
| committer | Andrew Turner <andrew@FreeBSD.org> | 2018-11-01 10:25:22 +0000 |
| commit | e403f9865d830fc7ef2509562872fb9dc6feb325 (patch) | |
| tree | ad922f0909619c545deb5cc46155d6968b41e894 /sys | |
| parent | 7f98104d1f2fd764326a0513a8b1241d681bf89d (diff) | |
| download | src-e403f9865d830fc7ef2509562872fb9dc6feb325.tar.gz src-e403f9865d830fc7ef2509562872fb9dc6feb325.zip | |
Use the correct offsets for the trap frame in fork_trampoline.
Sponsored by: DARPA, AFRL
Notes
Notes:
svn path=/head/; revision=339988
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arm64/arm64/swtch.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arm64/arm64/swtch.S b/sys/arm64/arm64/swtch.S index 4c2c3aca5833..d9921f7e9528 100644 --- a/sys/arm64/arm64/swtch.S +++ b/sys/arm64/arm64/swtch.S @@ -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 |