diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-06-08 20:36:28 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-06-08 20:36:28 +0000 |
| commit | 51f0b5a777dd9f968f599e93e467f5eed9dfe479 (patch) | |
| tree | 154c551ccdcaf354c1bb61fe20ec5205953de431 /pkg/sentry/platform/ring0 | |
| parent | 4c47990e36edf3652ce59162da7d9bdf8923c565 (diff) | |
| parent | dc029b4b96e92719b2850e9d5556f68837737997 (diff) | |
Merge release-20200522.0-95-gdc029b4b (automated)
Diffstat (limited to 'pkg/sentry/platform/ring0')
| -rw-r--r-- | pkg/sentry/platform/ring0/defs_impl_amd64.go | 8 | ||||
| -rw-r--r-- | pkg/sentry/platform/ring0/defs_impl_arm64.go | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkg/sentry/platform/ring0/defs_impl_amd64.go b/pkg/sentry/platform/ring0/defs_impl_amd64.go index 50ac3040e..d910f0e0a 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/sentry/platform/ring0/pagetables" - - "fmt" "gvisor.dev/gvisor/pkg/cpuid" "gvisor.dev/gvisor/pkg/sentry/arch" - "gvisor.dev/gvisor/pkg/usermem" + "gvisor.dev/gvisor/pkg/sentry/platform/ring0/pagetables" "io" "reflect" + + "fmt" + "gvisor.dev/gvisor/pkg/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 93f23047d..e790a68cc 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" + "reflect" ) // Useful bits. |