summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/platform
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-15 18:56:16 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-15 18:56:16 +0000
commitf19f2d16c58ef3a3e20344dfb366971724a81eab (patch)
tree90d153a5fc2ac95fa5a083a54896d2ba4f9bf7ad /pkg/sentry/platform
parent96ed05d6d25e612012cd19db2316652a1f639f49 (diff)
parentd3880b76cbeaa1cadc38388d5684e00172566376 (diff)
Merge release-20200907.0-44-gd3880b76c (automated)
Diffstat (limited to 'pkg/sentry/platform')
-rw-r--r--pkg/sentry/platform/ring0/defs_impl_arm64.go3
1 files changed, 1 insertions, 2 deletions
diff --git a/pkg/sentry/platform/ring0/defs_impl_arm64.go b/pkg/sentry/platform/ring0/defs_impl_arm64.go
index eda1e1484..9fb351879 100644
--- a/pkg/sentry/platform/ring0/defs_impl_arm64.go
+++ b/pkg/sentry/platform/ring0/defs_impl_arm64.go
@@ -4,10 +4,9 @@ import (
"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.