summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/platform
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-08-25 14:22:08 +0000
committergVisor bot <gvisor-bot@google.com>2020-08-25 14:22:08 +0000
commitb4b7accd934e853384bc896b9c7e388162b8ca29 (patch)
tree84de0a1485ca0e744670c7b666d2b7d54a3499db /pkg/sentry/platform
parent063b02982e1cff93013b3829fb03fe2cd99cc68a (diff)
parentae332d96e4bd8b37be16901317d83e24e31c24d7 (diff)
Merge release-20200818.0-39-gae332d96e (automated)
Diffstat (limited to 'pkg/sentry/platform')
-rw-r--r--pkg/sentry/platform/ring0/defs_impl_arm64.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkg/sentry/platform/ring0/defs_impl_arm64.go b/pkg/sentry/platform/ring0/defs_impl_arm64.go
index 9fb351879..eda1e1484 100644
--- a/pkg/sentry/platform/ring0/defs_impl_arm64.go
+++ b/pkg/sentry/platform/ring0/defs_impl_arm64.go
@@ -4,9 +4,10 @@ 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.