summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/platform
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-18 03:03:37 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-18 03:03:37 +0000
commite6486141a9b379f06e841b86d867ef4f09421d3a (patch)
tree5be402dc35fdf8360f474172afa6f4cbd4fa0106 /pkg/sentry/platform
parente6af9699c8065e6f9f578bdf0213853dcbe07bbd (diff)
parentd34bda027309695e3e6fb6f92a5839cd1f21173e (diff)
Merge release-20200907.0-134-gd34bda027 (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 f567ef868..dbf1ef5cf 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/usermem"
+ "gvisor.dev/gvisor/pkg/sentry/platform/ring0/pagetables"
"io"
"reflect"
+
+ "gvisor.dev/gvisor/pkg/usermem"
)
// Useful bits.