summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/time
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-18 04:57:45 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-18 04:57:45 +0000
commit812161250ab2d4b6048b63541f77877db9120099 (patch)
tree3b03c40d4d1749ff58d3e2638b778517c71a2aa5 /pkg/sentry/time
parente6486141a9b379f06e841b86d867ef4f09421d3a (diff)
parent0b8d306e64f89e0d63a558f69a846d36beeea51d (diff)
Merge release-20200907.0-135-g0b8d306e6 (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 14978ed91..2cb001080 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