diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-09-16 23:29:16 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-09-16 23:29:16 +0000 |
| commit | 86acff82320dd0aa50838b7ed70d46c8f2e851a5 (patch) | |
| tree | 605ee75fd1c9106fac1bc5f382e84d12b7381923 /pkg/sentry | |
| parent | b332e676ad30b43851aa878d52586413afe3d299 (diff) | |
| parent | 64aae6bbd6ab8c23ee48fd6e7315c27c2cbf2ea4 (diff) | |
Merge release-20200907.0-68-g64aae6bbd (automated)
Diffstat (limited to 'pkg/sentry')
| -rw-r--r-- | pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo_unsafe.go | 4 | ||||
| -rw-r--r-- | pkg/sentry/platform/ring0/defs_impl_arm64.go | 6 | ||||
| -rw-r--r-- | pkg/sentry/time/seqatomic_parameters_unsafe.go | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo_unsafe.go b/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo_unsafe.go index a0f2fe45c..4e10436e6 100644 --- a/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo_unsafe.go +++ b/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo_unsafe.go @@ -1,12 +1,12 @@ package kernel import ( + "reflect" + "strings" "unsafe" "fmt" "gvisor.dev/gvisor/pkg/sync" - "reflect" - "strings" ) // SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race diff --git a/pkg/sentry/platform/ring0/defs_impl_arm64.go b/pkg/sentry/platform/ring0/defs_impl_arm64.go index dbf1ef5cf..78547069f 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. diff --git a/pkg/sentry/time/seqatomic_parameters_unsafe.go b/pkg/sentry/time/seqatomic_parameters_unsafe.go index f18440378..5eb560f57 100644 --- a/pkg/sentry/time/seqatomic_parameters_unsafe.go +++ b/pkg/sentry/time/seqatomic_parameters_unsafe.go @@ -1,12 +1,12 @@ package time import ( + "reflect" + "strings" "unsafe" "fmt" "gvisor.dev/gvisor/pkg/sync" - "reflect" - "strings" ) // SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race |