summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/time
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-04 06:33:55 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-04 06:33:55 +0000
commit5bd166a465a48fc359583afcc723f2883a8dc38b (patch)
tree85faa1b7381cc052d231cf654e5de93b2b7714ba /pkg/sentry/time
parent27719ce07c53993b758ce7cc3ca298c1f9335b3a (diff)
parentc564293b65eefcf1342023694e4aae82314de014 (diff)
Merge release-20200818.0-123-gc564293b6 (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