summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/time
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-08 19:37:12 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-08 19:37:12 +0000
commit41db15c575c283d93c6dd432bc68382e4f4a7928 (patch)
tree1ca997404c9b6a9636bf5ebed4890ff6ab6cd989 /pkg/sentry/time
parent936d44161505242f5dea33ec1db1d5d1b5d19068 (diff)
parent38cdb0579b698d67abad4f7f6ba18a84eef66bd7 (diff)
Merge release-20200818.0-128-g38cdb0579 (automated)
Diffstat (limited to 'pkg/sentry/time')
-rw-r--r--pkg/sentry/time/seqatomic_parameters_unsafe.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/sentry/time/seqatomic_parameters_unsafe.go b/pkg/sentry/time/seqatomic_parameters_unsafe.go
index f18440378..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 (
+ "strings"
"unsafe"
"fmt"
"gvisor.dev/gvisor/pkg/sync"
"reflect"
- "strings"
)
// SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race