diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-09-15 20:51:08 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-09-15 20:51:08 +0000 |
| commit | b052e1d3b81a6295172bf375d43ebbd20bd7c853 (patch) | |
| tree | 106eb6dc926169f07641281b361e56d248071509 /pkg/sentry/time | |
| parent | ee250c2b64e235d32dca91830ca8edfba4e3c5fb (diff) | |
| parent | 0d790cbaea5cd40ceabdf8f59978efff1a0626f1 (diff) | |
Merge release-20200907.0-48-g0d790cbae (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 |