diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-07-08 20:30:17 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-07-08 20:30:17 +0000 |
| commit | 44eed3ec862ab81483249f2223b7f09b88998aee (patch) | |
| tree | 31cb695f7bfc163572f632eac5da87eaf4863d61 /pkg/sentry | |
| parent | 59c89ef0567003c05275ab05bc70df3456492caa (diff) | |
| parent | f3fa43cf237109c1e1cb0cf7ba63bb793cc2ff1f (diff) | |
Merge release-20200622.1-81-gf3fa43cf2 (automated)
Diffstat (limited to 'pkg/sentry')
| -rw-r--r-- | pkg/sentry/platform/ring0/defs_impl_amd64.go | 3 | ||||
| -rw-r--r-- | pkg/sentry/platform/ring0/defs_impl_arm64.go | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pkg/sentry/platform/ring0/defs_impl_amd64.go b/pkg/sentry/platform/ring0/defs_impl_amd64.go index c7f1d36f7..50ac3040e 100644 --- a/pkg/sentry/platform/ring0/defs_impl_amd64.go +++ b/pkg/sentry/platform/ring0/defs_impl_amd64.go @@ -1,10 +1,11 @@ package ring0 import ( + "gvisor.dev/gvisor/pkg/sentry/platform/ring0/pagetables" + "fmt" "gvisor.dev/gvisor/pkg/cpuid" "gvisor.dev/gvisor/pkg/sentry/arch" - "gvisor.dev/gvisor/pkg/sentry/platform/ring0/pagetables" "gvisor.dev/gvisor/pkg/usermem" "io" "reflect" diff --git a/pkg/sentry/platform/ring0/defs_impl_arm64.go b/pkg/sentry/platform/ring0/defs_impl_arm64.go index e790a68cc..93f23047d 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 ( + "fmt" "gvisor.dev/gvisor/pkg/sentry/arch" "gvisor.dev/gvisor/pkg/sentry/platform/ring0/pagetables" - - "fmt" - "gvisor.dev/gvisor/pkg/usermem" "io" "reflect" + + "gvisor.dev/gvisor/pkg/usermem" ) // Useful bits. |