summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/platform
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-01 16:58:01 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-01 16:58:01 +0000
commit964da19b9b3361162209ad820eab7a957d10bc20 (patch)
treee2d3c86de0536d55bff9ece1ccd05787b08d5995 /pkg/sentry/platform
parent1e30e0a3f34aa20e8bc1c827a2c6db7566540ee8 (diff)
parent0eae08bc9e77d54c415c9d59ac3e1fa1f35f0a18 (diff)
Merge release-20200818.0-98-g0eae08bc9 (automated)
Diffstat (limited to 'pkg/sentry/platform')
-rw-r--r--pkg/sentry/platform/ring0/defs_impl_arm64.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/sentry/platform/ring0/defs_impl_arm64.go b/pkg/sentry/platform/ring0/defs_impl_arm64.go
index eda1e1484..8ebfbfdb6 100644
--- a/pkg/sentry/platform/ring0/defs_impl_arm64.go
+++ b/pkg/sentry/platform/ring0/defs_impl_arm64.go
@@ -1,13 +1,13 @@
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"
-
- "gvisor.dev/gvisor/pkg/usermem"
)
// Useful bits.