summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/time
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-18 06:40:57 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-18 06:40:57 +0000
commitc15f5bc029506bc329ae8c9c01efe12a6dbd23e3 (patch)
tree3bb3e5ec910592af98aebb663e14f128ae82e49c /pkg/sentry/time
parent333a0f0314f5813d07427adbe1605441bb0fffb0 (diff)
parent07d832dbb539e0bcca74800d09d0ea607d8173a3 (diff)
Merge release-20200907.0-137-g07d832dbb (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