summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/platform
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-03 12:55:26 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-03 12:55:26 +0000
commit3084d4946aaa6c28fb62df129744a69516ab5e13 (patch)
tree6e7d1b68176ddc0d5a812f63972e272ac8b032cb /pkg/sentry/platform
parentf4dac3c3846985701f21b36ed089c0bf48b618fc (diff)
parent319ce67369b48841c5ee30c7d1b54428ea3b4bab (diff)
Merge release-20200818.0-118-g319ce6736 (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.