diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-08-10 22:54:11 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-08-10 22:54:11 +0000 |
| commit | e43af1e55f93fe0e6f921829887f2197dcee44ff (patch) | |
| tree | 78e4479eeaccf6d4e9569efec14ae90a0d6ec83d /pkg/sentry/platform/ring0 | |
| parent | 35b33b63e614c883c51cb3a2de3f725bb9f28d63 (diff) | |
| parent | a1af46c20ade5566ca8c2583f10c17765a5dc3ad (diff) | |
Merge release-20200804.0-59-ga1af46c20 (automated)
Diffstat (limited to 'pkg/sentry/platform/ring0')
| -rw-r--r-- | pkg/sentry/platform/ring0/defs_impl_arm64.go | 6 |
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 eda1e1484..8ebfbfdb6 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/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" - - "gvisor.dev/gvisor/pkg/usermem" ) // Useful bits. |