summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/platform
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-08-25 22:10:46 +0000
committergVisor bot <gvisor-bot@google.com>2020-08-25 22:10:46 +0000
commit80c5363705ae7b01bee221d9eb698a6db1085ccf (patch)
treefc0fc0d24593f92a7b1a2b5ee4fa1ac35061df03 /pkg/sentry/platform
parent001f6a532c343df42ec8c708f7c34de265617e5d (diff)
parentbee07a2d68dedd49fa5790803fb2f7076323a616 (diff)
Merge release-20200818.0-51-gbee07a2d6 (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 eda1e1484..2dac9ad14 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.