summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/time
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-21 21:51:32 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-21 21:51:32 +0000
commit3ad7c376eba1b00ddf2a9c3907f5fa12edf137c8 (patch)
tree37c9ec625932dd37ad983e79a0f644b696948383 /pkg/sentry/time
parentcfe23681046fdf67b4423ecbf797a084802eb1a1 (diff)
parent10dcefbc77815314d56e45f01b8c9986a2c56778 (diff)
Merge release-20200914.0-124-g10dcefbc7 (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 5eb560f57..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 (
+ "fmt"
+ "gvisor.dev/gvisor/pkg/sync"
"reflect"
"strings"
"unsafe"
-
- "fmt"
- "gvisor.dev/gvisor/pkg/sync"
)
// SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race