summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/time
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-10 01:29:05 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-10 01:29:05 +0000
commit4fec9ed0c6c6dde8a13707a0e98b06208f4373dc (patch)
tree036ecb7293413af0baa0e6d2b2fa88988f2d771c /pkg/sentry/time
parent70f3588c8e0659a0e54af293439c18c137323e16 (diff)
parentf949951144dc11391804ddc89042a1e9ce800972 (diff)
Merge release-20200818.0-145-gf94995114 (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 14978ed91..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 (
+ "fmt"
+ "reflect"
"strings"
"unsafe"
- "fmt"
"gvisor.dev/gvisor/pkg/sync"
- "reflect"
)
// SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race