summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-06-10 17:37:07 +0000
committergVisor bot <gvisor-bot@google.com>2020-06-10 17:37:07 +0000
commitf5c6e5c747bdf805a69c8d93ced3fdb58f1dfb91 (patch)
tree6648a9222e932ff0c598f5633908512411732207 /pkg/sentry
parent3e0604d9c20f3c3c4ff945bc338fa27d6e06037c (diff)
parent9d2b2c121f700b87b3079b7d08b54b53f0634436 (diff)
Merge release-20200522.0-114-g9d2b2c121 (automated)
Diffstat (limited to 'pkg/sentry')
-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 93f23047d..a5eface16 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.