summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-08-10 23:25:33 +0000
committergVisor bot <gvisor-bot@google.com>2020-08-10 23:25:33 +0000
commit1e5eb26802956650cbe9a32bd6179a07f0918ff6 (patch)
tree797618044794b3207eea2fc5e079c4d7a61681f0 /pkg/sentry
parente43af1e55f93fe0e6f921829887f2197dcee44ff (diff)
parent0a8ae4b32f0dbc0b2a84c3f07c8c98e855a8f5fa (diff)
Merge release-20200804.0-60-g0a8ae4b32 (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 8ebfbfdb6..9fb351879 100644
--- a/pkg/sentry/platform/ring0/defs_impl_arm64.go
+++ b/pkg/sentry/platform/ring0/defs_impl_arm64.go
@@ -1,10 +1,9 @@
package ring0
import (
- "gvisor.dev/gvisor/pkg/sentry/platform/ring0/pagetables"
-
"fmt"
"gvisor.dev/gvisor/pkg/sentry/arch"
+ "gvisor.dev/gvisor/pkg/sentry/platform/ring0/pagetables"
"gvisor.dev/gvisor/pkg/usermem"
"io"
"reflect"