diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-10-28 14:42:18 -0700 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-10-28 14:42:18 -0700 |
| commit | d20ef61a839efa19bed44a1cfa4a30a247056ffe (patch) | |
| tree | 0e777ff63a6c65a52de8cf84bc209c53fd641599 /pkg/sentry/platform | |
| parent | 9907539d92f0233fa7a0daba22484085da44d1c4 (diff) | |
| parent | c534c91b86b5190a367174db97c4a14fe0d0ffae (diff) | |
Merge pull request #4630 from lemin9538:lemin_arm64_dev
PiperOrigin-RevId: 339540747
Diffstat (limited to 'pkg/sentry/platform')
| -rw-r--r-- | pkg/sentry/platform/ring0/entry_arm64.s | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkg/sentry/platform/ring0/entry_arm64.s b/pkg/sentry/platform/ring0/entry_arm64.s index 1079a024b..f9278b653 100644 --- a/pkg/sentry/platform/ring0/entry_arm64.s +++ b/pkg/sentry/platform/ring0/entry_arm64.s @@ -516,6 +516,10 @@ TEXT ·kernelExitToEl1(SB),NOSPLIT,$0 MOVD CPU_REGISTERS+PTRACE_PC(RSV_REG), R1 MSR R1, ELR_EL1 + // restore sentry's tls. + MOVD CPU_REGISTERS+PTRACE_TLS(RSV_REG), R1 + MSR R1, TPIDR_EL0 + MOVD CPU_REGISTERS+PTRACE_SP(RSV_REG), R1 MOVD R1, RSP |