summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-08-18 19:59:58 +0000
committergVisor bot <gvisor-bot@google.com>2020-08-18 19:59:58 +0000
commitfa46491954ce289ddb44a3b1d4e7ee021dd74c30 (patch)
tree282c64a59b86ee24c3d4a64eebdb43f3620c8aa9 /pkg/sentry
parent499d41d889eb9c7553f5249f11c51c1f7dd87fca (diff)
parent4141dc0d2c8c46b14dbae83aab304fa338ebafc5 (diff)
Merge release-20200810.0-50-g4141dc0d2 (automated)
Diffstat (limited to 'pkg/sentry')
-rw-r--r--pkg/sentry/platform/ring0/defs_impl_arm64.go3
1 files changed, 1 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..9fb351879 100644
--- a/pkg/sentry/platform/ring0/defs_impl_arm64.go
+++ b/pkg/sentry/platform/ring0/defs_impl_arm64.go
@@ -1,10 +1,9 @@
package ring0
import (
- "gvisor.dev/gvisor/pkg/sentry/platform/ring0/pagetables"
-
"fmt"
"gvisor.dev/gvisor/pkg/sentry/arch"
+ "gvisor.dev/gvisor/pkg/sentry/platform/ring0/pagetables"
"gvisor.dev/gvisor/pkg/usermem"
"io"
"reflect"