summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/platform
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-08-31 19:02:01 +0000
committergVisor bot <gvisor-bot@google.com>2020-08-31 19:02:01 +0000
commit8be39aac0e1b1d1b535b97998a32e190002b9107 (patch)
tree5b5a2765ec95b7eaba8cab9afb7c7c2c464a82cb /pkg/sentry/platform
parent50c785c0bc6e9a370ca831f59c94a5fa77aa2e90 (diff)
parenta3d189301d811729742a38de9a3cad453f858475 (diff)
Merge release-20200818.0-89-ga3d189301 (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.