diff options
author | gVisor bot <gvisor-bot@google.com> | 2020-09-11 23:52:14 +0000 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2020-09-11 23:52:14 +0000 |
commit | 0c23d4f03bfe755f2aecb29e1b3e8740507b320b (patch) | |
tree | 65ef963ad81396043932dd63419f04cdf5db3ea6 /pkg/sentry/platform | |
parent | 2c7d03d2378865ee92d7ae24e48748f17233e783 (diff) | |
parent | 8d0f76dda8df42f1701e6d82347ecf69b6271a13 (diff) |
Merge release-20200810.0-237-g8d0f76dda (automated)
Diffstat (limited to 'pkg/sentry/platform')
-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 eba2eac30..2dac9ad14 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" - "io" "reflect" "fmt" "gvisor.dev/gvisor/pkg/usermem" + "io" ) // 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 |