diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-08-27 22:49:41 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-08-27 22:49:41 +0000 |
| commit | d0021eca2ad4b9ea932f30dd7229ad337342403d (patch) | |
| tree | c2b025a68edcd98ae2fc8844c235ecf2a0c9a85e /pkg/sentry/platform | |
| parent | d017d0a51146cf4c287248d015bdd2c066a25994 (diff) | |
| parent | 6f8fb7e0db2790ff1f5ba835780c03fe245e437f (diff) | |
Merge release-20200818.0-74-g6f8fb7e0d (automated)
Diffstat (limited to 'pkg/sentry/platform')
| -rw-r--r-- | pkg/sentry/platform/ring0/defs_impl_arm64.go | 3 |
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 eda1e1484..9fb351879 100644 --- a/pkg/sentry/platform/ring0/defs_impl_arm64.go +++ b/pkg/sentry/platform/ring0/defs_impl_arm64.go @@ -4,10 +4,9 @@ import ( "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. |