summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/time
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-16 22:10:02 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-16 22:10:02 +0000
commitb332e676ad30b43851aa878d52586413afe3d299 (patch)
tree0162940eed68e9e900f17998665f36e09f1b8867 /pkg/sentry/time
parent4827225c3d228c936852c8f87da791e1c45331f1 (diff)
parentb6d165fe98b908a7aa97e3fadd61ddd3731be915 (diff)
Merge release-20200907.0-67-gb6d165fe9 (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