summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/time
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-10 23:53:22 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-10 23:53:22 +0000
commita9b8163485d5fab4a27410b4a14d9ec5df5c317c (patch)
tree6298b066326fce64c5e79dff4d436f4735a80dd9 /pkg/sentry/time
parent78d35a03a6d99a79f725c6ed60172ae4c4aba71a (diff)
parent365545855f7713236d77d3e263ad09ebffa85bb2 (diff)
Merge release-20200818.0-154-g365545855 (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