summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-08-12 23:24:25 +0000
committergVisor bot <gvisor-bot@google.com>2020-08-12 23:24:25 +0000
commit6475914b04e69d1729028739ef688e452f034f70 (patch)
tree6e19326595ef87f6f80d0a3fbb978de33dbc855a /pkg/sentry
parenta2e5062951e1dd7a996369edd9549e4dfa556dcb (diff)
parentd50f2e2c7639084bbccac35fcc5f55e3f83f646a (diff)
Merge release-20200810.0-19-gd50f2e2c7 (automated)
Diffstat (limited to 'pkg/sentry')
-rw-r--r--pkg/sentry/platform/ring0/defs_impl_arm64.go5
1 files changed, 2 insertions, 3 deletions
diff --git a/pkg/sentry/platform/ring0/defs_impl_arm64.go b/pkg/sentry/platform/ring0/defs_impl_arm64.go
index eba2eac30..9fb351879 100644
--- a/pkg/sentry/platform/ring0/defs_impl_arm64.go
+++ b/pkg/sentry/platform/ring0/defs_impl_arm64.go
@@ -1,13 +1,12 @@
package ring0
import (
+ "fmt"
"gvisor.dev/gvisor/pkg/sentry/arch"
"gvisor.dev/gvisor/pkg/sentry/platform/ring0/pagetables"
+ "gvisor.dev/gvisor/pkg/usermem"
"io"
"reflect"
-
- "fmt"
- "gvisor.dev/gvisor/pkg/usermem"
)
// Useful bits.