diff options
| author | gVisor bot <gvisor-bot@google.com> | 2019-12-09 19:25:28 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-12-09 19:25:28 +0000 |
| commit | 533b9abd45d1a0baecd1e5f518ccc51b1098f383 (patch) | |
| tree | 46152f62d70b6cea74d4587c5616e75025d63d27 /pkg/sentry | |
| parent | 59aa51e3662d4142f29478cdce876f8516e2531b (diff) | |
| parent | 498595d54347d711dbd24247ed12c659b9d89c58 (diff) | |
Merge release-20191129.0-24-g498595d (automated)
Diffstat (limited to 'pkg/sentry')
| -rwxr-xr-x | pkg/sentry/platform/ring0/defs_impl_amd64.go | 6 | ||||
| -rwxr-xr-x | pkg/sentry/platform/ring0/defs_impl_arm64.go | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkg/sentry/platform/ring0/defs_impl_amd64.go b/pkg/sentry/platform/ring0/defs_impl_amd64.go index f944c2fc3..58da90cf2 100755 --- a/pkg/sentry/platform/ring0/defs_impl_amd64.go +++ b/pkg/sentry/platform/ring0/defs_impl_amd64.go @@ -1,14 +1,14 @@ package ring0 import ( - "syscall" - "fmt" "gvisor.dev/gvisor/pkg/cpuid" "gvisor.dev/gvisor/pkg/sentry/platform/ring0/pagetables" - "gvisor.dev/gvisor/pkg/sentry/usermem" "io" "reflect" + "syscall" + + "gvisor.dev/gvisor/pkg/sentry/usermem" ) // Kernel is a global kernel object. diff --git a/pkg/sentry/platform/ring0/defs_impl_arm64.go b/pkg/sentry/platform/ring0/defs_impl_arm64.go index b1f2131a1..2af77277f 100755 --- 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 ( + "reflect" "syscall" "fmt" "gvisor.dev/gvisor/pkg/sentry/platform/ring0/pagetables" "gvisor.dev/gvisor/pkg/sentry/usermem" "io" - "reflect" ) // Useful bits. |