summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/platform
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-08-20 21:16:11 +0000
committergVisor bot <gvisor-bot@google.com>2020-08-20 21:16:11 +0000
commit233e1b775fd3188da44f8cbf8449350f21ad7f91 (patch)
tree4de4664371e68acf68a0e9dfb49ae3ea274c371e /pkg/sentry/platform
parent8c844b60d240b3b00a45620044be39e8797294f7 (diff)
parent3163aff866852e730777be4ef689b0405c6332cd (diff)
Merge release-20200810.0-75-g3163aff86 (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.