summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/platform
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-08-24 19:31:32 +0000
committergVisor bot <gvisor-bot@google.com>2020-08-24 19:31:32 +0000
commit9e6ec44f211e4f7777154bce00b5c463f9e8d8ee (patch)
tree75450eed40ba29321687812a842f4d2b3b427040 /pkg/sentry/platform
parent5c6a6440ff792f1db57a47dd1580b34e571c2967 (diff)
parent339d266be4b2043b01ab0db43cafc36785e9978b (diff)
Merge release-20200818.0-32-g339d266be (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.