summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/platform/ring0
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-08-08 05:52:44 +0000
committergVisor bot <gvisor-bot@google.com>2020-08-08 05:52:44 +0000
commitab32c85544000a00e9cf25a9677089909d896d86 (patch)
tree240d0bcb178a8475ae2f4128f162782d44c00c88 /pkg/sentry/platform/ring0
parent77f7fcf41ffbc224055cb4413ba7e686b98910b8 (diff)
parent13a8ae81b2361cd32f8e73d14ca5b9bca9569b1a (diff)
Merge release-20200804.0-53-g13a8ae81b (automated)
Diffstat (limited to 'pkg/sentry/platform/ring0')
-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..8ebfbfdb6 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/arch"
"gvisor.dev/gvisor/pkg/sentry/platform/ring0/pagetables"
- "reflect"
"fmt"
+ "gvisor.dev/gvisor/pkg/sentry/arch"
"gvisor.dev/gvisor/pkg/usermem"
"io"
+ "reflect"
)
// Useful bits.