diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-09-22 17:03:20 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-09-22 17:03:20 +0000 |
| commit | d07a4cfdf34371df1a94791d013e62a707cbb683 (patch) | |
| tree | d1a3f9326a7125c8b367bbfef1b7b2220d4ce723 /pkg/sentry/time | |
| parent | a425892df3749c96c8557546f185358c2f784a66 (diff) | |
| parent | 13a9a622e13ccdda76ed02d3de99b565212f6b2f (diff) | |
Merge release-20200914.0-130-g13a9a622e (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 |