summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/time
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-09 05:02:38 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-09 05:02:38 +0000
commitc5ee060bf372e045dd6ce408d26587ade3a8b8f9 (patch)
tree72a3a23cd7d0479c4634303c8ad357b7bfd9da74 /pkg/sentry/time
parentfe97f9816075b6b9ed6537c4cf403bb898f7952a (diff)
parent00479af515289f42a63ab14cec128ab030120b38 (diff)
Merge release-20200818.0-138-g00479af51 (automated)
Diffstat (limited to 'pkg/sentry/time')
-rw-r--r--pkg/sentry/time/seqatomic_parameters_unsafe.go5
1 files changed, 2 insertions, 3 deletions
diff --git a/pkg/sentry/time/seqatomic_parameters_unsafe.go b/pkg/sentry/time/seqatomic_parameters_unsafe.go
index 14978ed91..88d6b5569 100644
--- a/pkg/sentry/time/seqatomic_parameters_unsafe.go
+++ b/pkg/sentry/time/seqatomic_parameters_unsafe.go
@@ -1,12 +1,11 @@
package time
import (
- "strings"
- "unsafe"
-
"fmt"
"gvisor.dev/gvisor/pkg/sync"
"reflect"
+ "strings"
+ "unsafe"
)
// SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race