summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/time
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-03 22:27:52 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-03 22:27:52 +0000
commita752a73ce5db5f1a015fb766ff05717854f9fb00 (patch)
tree1c84cd2ee6037448c555728b33fac47fbbac5ba6 /pkg/sentry/time
parenta842a338ecd95a53dad6fae976c11a137d56938f (diff)
parent76e51c8b9add2e8dd7538a9ccd126409c31f7cc0 (diff)
Merge release-20200818.0-120-g76e51c8b9 (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