summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/time
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-11 20:32:32 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-11 20:32:32 +0000
commitb758e31a9b2f0f68d0c0182a74da954f81053f72 (patch)
tree8cdfe4456e0b19ed5633af800f414ed12cc8c68e /pkg/sentry/time
parenta7a5a8528ca6f79dfd89941bd75c14930c43d42c (diff)
parent325f7036b051a705d5ae595d2f3c351084262532 (diff)
Merge release-20200907.0-35-g325f7036b (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..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