summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/platform
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-10 11:07:18 -0700
committergVisor bot <gvisor-bot@google.com>2020-09-10 11:07:18 -0700
commit7275f293d7d0e3fef2f32f5087344977399c29ef (patch)
tree72a3edfde05c170b20f52c80e899bd9d90657f8b /pkg/sentry/platform
parent50c99a86d1c6807c67cdc52102b1fc570426669f (diff)
parent6d688347791526e2a1101333ccc7a410735cf31a (diff)
Merge pull request #3892 from lubinszARM:pr_n1_02
PiperOrigin-RevId: 330973856
Diffstat (limited to 'pkg/sentry/platform')
-rw-r--r--pkg/sentry/platform/ring0/entry_arm64.s4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkg/sentry/platform/ring0/entry_arm64.s b/pkg/sentry/platform/ring0/entry_arm64.s
index 9d29b7168..1e477cc49 100644
--- a/pkg/sentry/platform/ring0/entry_arm64.s
+++ b/pkg/sentry/platform/ring0/entry_arm64.s
@@ -27,7 +27,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