summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-08-10 17:36:36 +0000
committergVisor bot <gvisor-bot@google.com>2020-08-10 17:36:36 +0000
commitea361bd0cdd92a89dd66b692c396eae8e14fb53a (patch)
tree168c12fcb942fb632bd1ad50b22b01f9e816aa0c /pkg/sentry
parent6e6151b87b4ebfae504cddff4a88188ca87ae15b (diff)
parent79e7d0b06ac019e3c302e2ab9c5861311304d7d1 (diff)
Merge release-20200804.0-55-g79e7d0b06 (automated)
Diffstat (limited to 'pkg/sentry')
-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.