summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/platform
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-18 17:12:05 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-18 17:12:05 +0000
commit7d824eb860280a47646b73f71af2811f7e2c0d55 (patch)
treeb1b8b679688fbb51361646bb6f8a11793bcc455e /pkg/sentry/platform
parent246dfda4b850640fedc68d9038423348bab305c1 (diff)
parentef7d9a6fcdaaa77808c6607141e1a55c0ff92a7f (diff)
Merge release-20200907.0-140-gef7d9a6fc (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 0350d1080..dbf1ef5cf 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.