summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/platform/ring0
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-08-25 19:27:41 +0000
committergVisor bot <gvisor-bot@google.com>2020-08-25 19:27:41 +0000
commit7b456c46c11e83c4b00f0639dd7c36eb48637538 (patch)
tree78a689b8abb053b2cc193ac2f21a26eabbb978c0 /pkg/sentry/platform/ring0
parent843df342ef1b24f402e431b5c89e0561b131b0db (diff)
parent3b2e50f539457556c33ea635b401a4f52e6a5274 (diff)
Merge release-20200818.0-46-g3b2e50f53 (automated)
Diffstat (limited to 'pkg/sentry/platform/ring0')
-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.