diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-09-03 02:22:51 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-09-03 02:22:51 +0000 |
| commit | fc17010ccd4fb5b2593a2bf18bcfc9ce4ee2f8c7 (patch) | |
| tree | 090305a72e59c794ef62d2e7e9d2c31610b987de /pkg/sentry | |
| parent | ba2b04392c3b72ce9684564f57c59a6a88c8c8a7 (diff) | |
| parent | 86c1ae095a95d2433b874d9b052ebcea6fab0e26 (diff) | |
Merge release-20200818.0-116-g86c1ae095 (automated)
Diffstat (limited to 'pkg/sentry')
| -rw-r--r-- | pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo_unsafe.go | 2 | ||||
| -rw-r--r-- | pkg/sentry/time/seqatomic_parameters_unsafe.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo_unsafe.go b/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo_unsafe.go index 8a2418c41..a0f2fe45c 100644 --- a/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo_unsafe.go +++ b/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo_unsafe.go @@ -1,12 +1,12 @@ package kernel import ( - "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/time/seqatomic_parameters_unsafe.go b/pkg/sentry/time/seqatomic_parameters_unsafe.go index 14978ed91..f18440378 100644 --- a/pkg/sentry/time/seqatomic_parameters_unsafe.go +++ b/pkg/sentry/time/seqatomic_parameters_unsafe.go @@ -1,12 +1,12 @@ package time import ( - "strings" "unsafe" "fmt" "gvisor.dev/gvisor/pkg/sync" "reflect" + "strings" ) // SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race |