summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/time
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-21 19:34:03 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-21 19:34:03 +0000
commit8c2ad2e6183931bf544834ce738d4aa5977d7b2c (patch)
tree359fd7d85a29e2d66b8af4fab8cb14bf81170b5d /pkg/sentry/time
parent9569f477d901a82c103646fb5e62a476a1a8a9fc (diff)
parentd72022373f8ab2ca60ec1494858a3cb3e2be9040 (diff)
Merge release-20200914.0-122-gd72022373 (automated)
Diffstat (limited to 'pkg/sentry/time')
-rw-r--r--pkg/sentry/time/seqatomic_parameters_unsafe.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/sentry/time/seqatomic_parameters_unsafe.go b/pkg/sentry/time/seqatomic_parameters_unsafe.go
index 14978ed91..f18440378 100644
--- a/pkg/sentry/time/seqatomic_parameters_unsafe.go
+++ b/pkg/sentry/time/seqatomic_parameters_unsafe.go
@@ -1,12 +1,12 @@
package time
import (
- "strings"
"unsafe"
"fmt"
"gvisor.dev/gvisor/pkg/sync"
"reflect"
+ "strings"
)
// SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race