summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/platform
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-09 16:11:36 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-09 16:11:36 +0000
commit41c75d6a7c0963b808c1713a08b962774082584c (patch)
tree462723924cbf6aeac80ef61c89cfe6c3158b0d2f /pkg/sentry/platform
parentc5ee060bf372e045dd6ce408d26587ade3a8b8f9 (diff)
parent26439f9a43a6a23bd9fbc64f2b43ca843ad25d99 (diff)
Merge release-20200818.0-139-g26439f9a4 (automated)
Diffstat (limited to 'pkg/sentry/platform')
-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"