summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/platform
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-14 23:11:51 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-14 23:11:51 +0000
commit96ed05d6d25e612012cd19db2316652a1f639f49 (patch)
tree6b5facf042b98bb8afea7aa2ed7100f35cea69e4 /pkg/sentry/platform
parent0c789429706f50a08dc524692037448c1e614887 (diff)
parent52ffeb2d6475fa2e427daf246abdd32e4825f3f8 (diff)
Merge release-20200907.0-43-g52ffeb2d6 (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 8ebfbfdb6..eda1e1484 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.