Date: Mon, 16 Sep 2019 14:45:21 +0000 (UTC) From: Andrew Turner <andrew@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r352402 - stable/12/sys/arm64/arm64 Message-ID: <201909161445.x8GEjLY8038077@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: andrew Date: Mon Sep 16 14:45:20 2019 New Revision: 352402 URL: https://svnweb.freebsd.org/changeset/base/352402 Log: MFC r339988: Use the correct offsets for the trap frame in fork_trampoline. Sponsored by: DARPA, AFRL Modified: stable/12/sys/arm64/arm64/swtch.S Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/arm64/arm64/swtch.S ============================================================================== --- stable/12/sys/arm64/arm64/swtch.S Mon Sep 16 14:43:43 2019 (r352401) +++ stable/12/sys/arm64/arm64/swtch.S Mon Sep 16 14:45:20 2019 (r352402) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909161445.x8GEjLY8038077>