diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-09-09 16:11:36 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-09-09 16:11:36 +0000 |
| commit | 41c75d6a7c0963b808c1713a08b962774082584c (patch) | |
| tree | 462723924cbf6aeac80ef61c89cfe6c3158b0d2f /pkg/sentry/time | |
| parent | c5ee060bf372e045dd6ce408d26587ade3a8b8f9 (diff) | |
| parent | 26439f9a43a6a23bd9fbc64f2b43ca843ad25d99 (diff) | |
Merge release-20200818.0-139-g26439f9a4 (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 |