summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/platform/ring0
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-08-29 00:23:35 +0000
committergVisor bot <gvisor-bot@google.com>2020-08-29 00:23:35 +0000
commit433ffad27c0986b847e3b7927b9df33e0f24e38a (patch)
tree33d88d37badb56fabdec60c18d1090022caf59ea /pkg/sentry/platform/ring0
parent493e5248c4af7d4ab10b8874e466bf2a2eeb80d2 (diff)
parentf6ddcbefac8d80d2d00eff90a48bbcd44b041c0f (diff)
Merge release-20200818.0-87-gf6ddcbefa (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 8ebfbfdb6..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 (
+ "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.