diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-06-06 03:52:29 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-06-06 03:52:29 +0000 |
| commit | 35a850f06feca1014e6ec7fcf0f3576237dd6ad9 (patch) | |
| tree | 372186c40ce0daf645635d71af55fc275d48da8b /pkg/sentry/platform | |
| parent | 3fd0d124a05da2850ba2f1fb2e367d16266a5bf5 (diff) | |
| parent | 427d2082165e0949a00631a50cf5f6834d3d626d (diff) | |
Merge release-20200522.0-91-g427d2082 (automated)
Diffstat (limited to 'pkg/sentry/platform')
| -rw-r--r-- | pkg/sentry/platform/ring0/defs_impl_amd64.go | 6 | ||||
| -rw-r--r-- | pkg/sentry/platform/ring0/defs_impl_arm64.go | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkg/sentry/platform/ring0/defs_impl_amd64.go b/pkg/sentry/platform/ring0/defs_impl_amd64.go index 50ac3040e..d70b8d24a 100644 --- 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 ( + "gvisor.dev/gvisor/pkg/cpuid" + "gvisor.dev/gvisor/pkg/sentry/arch" "gvisor.dev/gvisor/pkg/sentry/platform/ring0/pagetables" + "reflect" "fmt" - "gvisor.dev/gvisor/pkg/cpuid" - "gvisor.dev/gvisor/pkg/sentry/arch" "gvisor.dev/gvisor/pkg/usermem" "io" - "reflect" ) // 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 93f23047d..a5eface16 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" - "io" "reflect" + "fmt" "gvisor.dev/gvisor/pkg/usermem" + "io" ) // Useful bits. |