summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/time
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-10 01:48:44 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-10 01:48:44 +0000
commitef52041ba62f826609d0fb0b2ee44bebe9d30712 (patch)
tree490ebc2e07db6fcaf9c7e82ce04a53ec79fa6d54 /pkg/sentry/time
parenta40ebdcb7944050fc94c70f491336deb21768f59 (diff)
parent644ac7b6bcf547cb44da6f298c92de4b3806c426 (diff)
Merge release-20200818.0-147-g644ac7b6b (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