diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-09-23 05:34:36 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-09-23 05:34:36 +0000 |
| commit | 8f530839ccfbea4d8bfe49891b44d408beed0126 (patch) | |
| tree | a1c5b9f68dd6f9bb66e3a374fc7ae349118a29cd /pkg/sentry/time | |
| parent | 43ee43819bf4f2e433065def7908aa57f493f5a7 (diff) | |
| parent | b54dbdfdc6b6cbdb6f45cd2abd9efb1f2f821a20 (diff) | |
Merge release-20200914.0-136-gb54dbdfdc (automated)
Diffstat (limited to 'pkg/sentry/time')
| -rw-r--r-- | pkg/sentry/time/seqatomic_parameters_unsafe.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkg/sentry/time/seqatomic_parameters_unsafe.go b/pkg/sentry/time/seqatomic_parameters_unsafe.go index 2cb001080..88d6b5569 100644 --- a/pkg/sentry/time/seqatomic_parameters_unsafe.go +++ b/pkg/sentry/time/seqatomic_parameters_unsafe.go @@ -2,11 +2,10 @@ 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 |