diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-09-17 18:56:15 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-09-17 18:56:15 +0000 |
| commit | 992a520782f3a6ad7bb813f91b5a6737c0a2418d (patch) | |
| tree | 1b49d8153fdcc609ae57ac870b0a0f211c7c9453 /pkg/sentry | |
| parent | e7a2420e6f8affb26504eb812331e072cccb25c6 (diff) | |
| parent | 51a2fe8eb4f045383e67093e3f3fa0b5fac8e9ac (diff) | |
Merge release-20200907.0-122-g51a2fe8eb (automated)
Diffstat (limited to 'pkg/sentry')
| -rw-r--r-- | pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo_unsafe.go | 6 | ||||
| -rw-r--r-- | pkg/sentry/time/seqatomic_parameters_unsafe.go | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo_unsafe.go b/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo_unsafe.go index a0f2fe45c..90148bbb2 100644 --- a/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo_unsafe.go +++ b/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo_unsafe.go @@ -1,12 +1,12 @@ package kernel import ( - "unsafe" - "fmt" - "gvisor.dev/gvisor/pkg/sync" "reflect" "strings" + "unsafe" + + "gvisor.dev/gvisor/pkg/sync" ) // SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race diff --git a/pkg/sentry/time/seqatomic_parameters_unsafe.go b/pkg/sentry/time/seqatomic_parameters_unsafe.go index f18440378..2cb001080 100644 --- a/pkg/sentry/time/seqatomic_parameters_unsafe.go +++ b/pkg/sentry/time/seqatomic_parameters_unsafe.go @@ -1,12 +1,12 @@ package time import ( - "unsafe" - "fmt" - "gvisor.dev/gvisor/pkg/sync" "reflect" "strings" + "unsafe" + + "gvisor.dev/gvisor/pkg/sync" ) // SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race |