diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-09-23 09:32:42 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-09-23 09:32:42 +0000 |
| commit | 0f688034971309cdab779c5030377eb88d4d5754 (patch) | |
| tree | cf778633ff774ba3298d5a1f9e0e8a4abc667b7d /pkg/sentry/time | |
| parent | 8f530839ccfbea4d8bfe49891b44d408beed0126 (diff) | |
| parent | 99decaadd6da0df2d8ec70ddea9d754c9d71a584 (diff) | |
Merge release-20200914.0-137-g99decaadd (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 |