summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-08-24 16:54:31 +0000
committergVisor bot <gvisor-bot@google.com>2020-08-24 16:54:31 +0000
commit3f11741804ad216c38cb2d821a269b8a3db64a2f (patch)
tree26b14f1615c5eaf4acc5396fd01d44e74eb563d7 /pkg/sentry
parentbb4d7a86f89c1c69dbd53bf09edb9177ee34d230 (diff)
parent89791a79bf8365486d726133e50176bcee9d76e4 (diff)
Merge release-20200810.0-93-g89791a79b (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 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.