diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-09-10 18:10:27 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-09-10 18:10:27 +0000 |
| commit | 04e6a55dc7e1ca7e9a3fc6a38cba87ddcca8f472 (patch) | |
| tree | 358ff16b30e133063414f0800dedae1f3492f082 /pkg/sentry/platform | |
| parent | 47acaa315cd75fec06ecbbcfab5058e20541cd55 (diff) | |
| parent | 7275f293d7d0e3fef2f32f5087344977399c29ef (diff) | |
Merge release-20200818.0-152-g7275f293d (automated)
Diffstat (limited to 'pkg/sentry/platform')
| -rw-r--r-- | pkg/sentry/platform/ring0/entry_impl_arm64.s | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkg/sentry/platform/ring0/entry_impl_arm64.s b/pkg/sentry/platform/ring0/entry_impl_arm64.s index f42800ebf..5bf870815 100644 --- a/pkg/sentry/platform/ring0/entry_impl_arm64.s +++ b/pkg/sentry/platform/ring0/entry_impl_arm64.s @@ -91,7 +91,9 @@ // ERET returns using the ELR and SPSR for the current exception level. #define ERET() \ - WORD $0xd69f03e0 + WORD $0xd69f03e0; \ + DSB $7; \ + ISB $15; // RSV_REG is a register that holds el1 information temporarily. #define RSV_REG R18_PLATFORM |