summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/time
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-22 19:48:33 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-22 19:48:33 +0000
commitd2b7cdd6075025b8c4d31f6b8bb0a8c10554fec2 (patch)
tree56cea299b731f074d81abc8951b17fb7b57159bf /pkg/sentry/time
parentd07a4cfdf34371df1a94791d013e62a707cbb683 (diff)
parent6e5ea605f4ca9fb8c29adc9510edc980f844ddfc (diff)
Merge release-20200914.0-131-g6e5ea605f (automated)
Diffstat (limited to 'pkg/sentry/time')
-rw-r--r--pkg/sentry/time/seqatomic_parameters_unsafe.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/sentry/time/seqatomic_parameters_unsafe.go b/pkg/sentry/time/seqatomic_parameters_unsafe.go
index 2cb001080..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 (
- "fmt"
- "reflect"
- "strings"
"unsafe"
+ "fmt"
"gvisor.dev/gvisor/pkg/sync"
+ "reflect"
+ "strings"
)
// SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race