summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/platform
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-23 05:34:36 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-23 05:34:36 +0000
commit8f530839ccfbea4d8bfe49891b44d408beed0126 (patch)
treea1c5b9f68dd6f9bb66e3a374fc7ae349118a29cd /pkg/sentry/platform
parent43ee43819bf4f2e433065def7908aa57f493f5a7 (diff)
parentb54dbdfdc6b6cbdb6f45cd2abd9efb1f2f821a20 (diff)
Merge release-20200914.0-136-gb54dbdfdc (automated)
Diffstat (limited to 'pkg/sentry/platform')
-rw-r--r--pkg/sentry/platform/ring0/defs_impl_arm64.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/sentry/platform/ring0/defs_impl_arm64.go b/pkg/sentry/platform/ring0/defs_impl_arm64.go
index f567ef868..9a83ad409 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"
+ "io"
+ "reflect"
"fmt"
- "gvisor.dev/gvisor/pkg/sentry/arch"
"gvisor.dev/gvisor/pkg/usermem"
- "io"
- "reflect"
)
// Useful bits.