summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-04-09 20:50:44 +0000
committergVisor bot <gvisor-bot@google.com>2020-04-09 20:50:44 +0000
commit893783cefc4e8a8b89348f61891fb65aeafc0f0f (patch)
tree91db32b6b076df596052bc7cc1d6606d4290b073 /pkg/sentry
parent74147313232d6db5293a79f6b59bf4db766a9d94 (diff)
parent9a5e5ab2fa2623fa5c1acf5faf5527e7eba20c07 (diff)
Merge release-20200323.0-107-g9a5e5ab (automated)
Diffstat (limited to 'pkg/sentry')
-rwxr-xr-xpkg/sentry/platform/ring0/defs_impl_arm64.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkg/sentry/platform/ring0/defs_impl_arm64.go b/pkg/sentry/platform/ring0/defs_impl_arm64.go
index 2902f9912..829f3d78b 100755
--- a/pkg/sentry/platform/ring0/defs_impl_arm64.go
+++ b/pkg/sentry/platform/ring0/defs_impl_arm64.go
@@ -2,11 +2,12 @@ package ring0
import (
"fmt"
- "gvisor.dev/gvisor/pkg/sentry/platform/ring0/pagetables"
"gvisor.dev/gvisor/pkg/usermem"
"io"
"reflect"
"syscall"
+
+ "gvisor.dev/gvisor/pkg/sentry/platform/ring0/pagetables"
)
// Useful bits.