summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/time
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-09 01:35:55 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-09 01:35:55 +0000
commitfe97f9816075b6b9ed6537c4cf403bb898f7952a (patch)
tree2657ae22c2ea9f57fa6bca5eb55c17c941b13f53 /pkg/sentry/time
parent3b05cf548590cec6acd4f63fe7fdcdb00fba9e79 (diff)
parent8d3551da6a41c30fa9c04a5b0cef712c089d5d04 (diff)
Merge release-20200818.0-137-g8d3551da6 (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 2cb001080..14978ed91 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