summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/platform
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-03 17:56:58 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-03 17:56:58 +0000
commita842a338ecd95a53dad6fae976c11a137d56938f (patch)
tree9ce1a0f883e2aa6d30484f47cccddb7f03468afa /pkg/sentry/platform
parent3084d4946aaa6c28fb62df129744a69516ab5e13 (diff)
parent30c20df76f969699619bc0819b6e54c9d6bcfb5a (diff)
Merge release-20200818.0-119-g30c20df76 (automated)
Diffstat (limited to 'pkg/sentry/platform')
-rw-r--r--pkg/sentry/platform/ring0/defs_impl_arm64.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/sentry/platform/ring0/defs_impl_arm64.go b/pkg/sentry/platform/ring0/defs_impl_arm64.go
index eda1e1484..8ebfbfdb6 100644
--- a/pkg/sentry/platform/ring0/defs_impl_arm64.go
+++ b/pkg/sentry/platform/ring0/defs_impl_arm64.go
@@ -1,13 +1,13 @@
package ring0
import (
+ "gvisor.dev/gvisor/pkg/sentry/platform/ring0/pagetables"
+
"fmt"
"gvisor.dev/gvisor/pkg/sentry/arch"
- "gvisor.dev/gvisor/pkg/sentry/platform/ring0/pagetables"
+ "gvisor.dev/gvisor/pkg/usermem"
"io"
"reflect"
-
- "gvisor.dev/gvisor/pkg/usermem"
)
// Useful bits.