summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/time
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-21 17:31:39 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-21 17:31:39 +0000
commit9569f477d901a82c103646fb5e62a476a1a8a9fc (patch)
tree6c13688ddf7f307864d9774034fe30830178724a /pkg/sentry/time
parentb8c1965141322e9f53a61f0c83cb56ab7224c73e (diff)
parente09d78f016ecbada5784324925b3c6b18041a2ec (diff)
Merge release-20200907.0-159-ge09d78f01 (automated)
Diffstat (limited to 'pkg/sentry/time')
-rw-r--r--pkg/sentry/time/seqatomic_parameters_unsafe.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/time/seqatomic_parameters_unsafe.go b/pkg/sentry/time/seqatomic_parameters_unsafe.go
index 2cb001080..14978ed91 100644
--- a/pkg/sentry/time/seqatomic_parameters_unsafe.go
+++ b/pkg/sentry/time/seqatomic_parameters_unsafe.go
@@ -1,12 +1,12 @@
package time
import (
- "fmt"
- "reflect"
"strings"
"unsafe"
+ "fmt"
"gvisor.dev/gvisor/pkg/sync"
+ "reflect"
)
// SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race