summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/platform
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-08-25 22:04:47 +0000
committergVisor bot <gvisor-bot@google.com>2020-08-25 22:04:47 +0000
commit001f6a532c343df42ec8c708f7c34de265617e5d (patch)
tree6bc58216b18091927f982dabf07030c90c6d1028 /pkg/sentry/platform
parent09136251e1edc9c035dd5c0f9d5589dcf5889cf5 (diff)
parentc28bbee993daea0efe2cc4cce6fdb6cbcf93c470 (diff)
Merge release-20200818.0-50-gc28bbee99 (automated)
Diffstat (limited to 'pkg/sentry/platform')
-rw-r--r--pkg/sentry/platform/ring0/defs_impl_arm64.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/platform/ring0/defs_impl_arm64.go b/pkg/sentry/platform/ring0/defs_impl_arm64.go
index 2dac9ad14..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 (
+ "fmt"
"gvisor.dev/gvisor/pkg/sentry/arch"
"gvisor.dev/gvisor/pkg/sentry/platform/ring0/pagetables"
+ "io"
"reflect"
- "fmt"
"gvisor.dev/gvisor/pkg/usermem"
- "io"
)
// Useful bits.