summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/time
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-15 18:56:16 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-15 18:56:16 +0000
commitf19f2d16c58ef3a3e20344dfb366971724a81eab (patch)
tree90d153a5fc2ac95fa5a083a54896d2ba4f9bf7ad /pkg/sentry/time
parent96ed05d6d25e612012cd19db2316652a1f639f49 (diff)
parentd3880b76cbeaa1cadc38388d5684e00172566376 (diff)
Merge release-20200907.0-44-gd3880b76c (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 f18440378..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 (
- "unsafe"
-
"fmt"
- "gvisor.dev/gvisor/pkg/sync"
"reflect"
"strings"
+ "unsafe"
+
+ "gvisor.dev/gvisor/pkg/sync"
)
// SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race