summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/time
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-09 21:51:55 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-09 21:51:55 +0000
commit8d45bb7aa1dfbee719fc3de52cabed1bba6df760 (patch)
tree903ca985bd4248d6087a48ce7ce74346483a950e /pkg/sentry/time
parentd7cccf62591a88483cafdb5d495f0f405378ae7d (diff)
parentaead623d934eeae88af4d66fc877e21a84770814 (diff)
Merge release-20200818.0-143-gaead623d9 (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