diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-09-21 22:10:40 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-09-21 22:10:40 +0000 |
| commit | 71d66d2e0df3560f8d92ac4a727c4dea021015ad (patch) | |
| tree | 28cb0fb744ace9a319519f09e011299ef0c145be /pkg/sentry/time | |
| parent | 3ad7c376eba1b00ddf2a9c3907f5fa12edf137c8 (diff) | |
| parent | 06dbd5b7bcd8ff16d73c38bdeac4677698385a65 (diff) | |
Merge release-20200914.0-125-g06dbd5b7b (automated)
Diffstat (limited to 'pkg/sentry/time')
| -rw-r--r-- | pkg/sentry/time/seqatomic_parameters_unsafe.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkg/sentry/time/seqatomic_parameters_unsafe.go b/pkg/sentry/time/seqatomic_parameters_unsafe.go index 88d6b5569..2cb001080 100644 --- a/pkg/sentry/time/seqatomic_parameters_unsafe.go +++ b/pkg/sentry/time/seqatomic_parameters_unsafe.go @@ -2,10 +2,11 @@ package time import ( "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 |