summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/time
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-17 23:31:46 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-17 23:31:46 +0000
commitac79776d6ed566babdc64b8ffe8363414aed817c (patch)
treefa6d53d933889c01a43332ebc66b0f6056d0ca4a /pkg/sentry/time
parent09fed163e1378e9598053b0e13e254b4757ff0f5 (diff)
parentf1f844daabdacf46f6237ddf0a90c370dbe2348a (diff)
Merge release-20200907.0-130-gf1f844daa (automated)
Diffstat (limited to 'pkg/sentry/time')
-rw-r--r--pkg/sentry/time/seqatomic_parameters_unsafe.go3
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..f18440378 100644
--- a/pkg/sentry/time/seqatomic_parameters_unsafe.go
+++ b/pkg/sentry/time/seqatomic_parameters_unsafe.go
@@ -1,11 +1,12 @@
package time
import (
+ "unsafe"
+
"fmt"
"gvisor.dev/gvisor/pkg/sync"
"reflect"
"strings"
- "unsafe"
)
// SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race