diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-09-11 20:38:26 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-09-11 20:38:26 +0000 |
| commit | 51194daa8da2bee362c9ecb6491016038e5f8436 (patch) | |
| tree | aa1d6310ea8b331f6985e01ae8d60b722a3e9972 /pkg/sentry/platform/ring0 | |
| parent | b758e31a9b2f0f68d0c0182a74da954f81053f72 (diff) | |
| parent | b8bee78d0c99a0c9423061b3dda10b9ef8c9719d (diff) | |
Merge release-20200810.0-236-gb8bee78d0 (automated)
Diffstat (limited to 'pkg/sentry/platform/ring0')
| -rw-r--r-- | pkg/sentry/platform/ring0/defs_impl_arm64.go | 2 | ||||
| -rw-r--r-- | pkg/sentry/platform/ring0/entry_impl_arm64.s | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/pkg/sentry/platform/ring0/defs_impl_arm64.go b/pkg/sentry/platform/ring0/defs_impl_arm64.go index 2dac9ad14..424b66f76 100644 --- a/pkg/sentry/platform/ring0/defs_impl_arm64.go +++ b/pkg/sentry/platform/ring0/defs_impl_arm64.go @@ -3,11 +3,11 @@ package ring0 import ( "gvisor.dev/gvisor/pkg/sentry/arch" "gvisor.dev/gvisor/pkg/sentry/platform/ring0/pagetables" - "reflect" "fmt" "gvisor.dev/gvisor/pkg/usermem" "io" + "reflect" ) // Useful bits. diff --git a/pkg/sentry/platform/ring0/entry_impl_arm64.s b/pkg/sentry/platform/ring0/entry_impl_arm64.s index 5bf870815..f42800ebf 100644 --- a/pkg/sentry/platform/ring0/entry_impl_arm64.s +++ b/pkg/sentry/platform/ring0/entry_impl_arm64.s @@ -91,9 +91,7 @@ // ERET returns using the ELR and SPSR for the current exception level. #define ERET() \ - WORD $0xd69f03e0; \ - DSB $7; \ - ISB $15; + WORD $0xd69f03e0 // RSV_REG is a register that holds el1 information temporarily. #define RSV_REG R18_PLATFORM |