summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/time
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-03 02:22:51 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-03 02:22:51 +0000
commitfc17010ccd4fb5b2593a2bf18bcfc9ce4ee2f8c7 (patch)
tree090305a72e59c794ef62d2e7e9d2c31610b987de /pkg/sentry/time
parentba2b04392c3b72ce9684564f57c59a6a88c8c8a7 (diff)
parent86c1ae095a95d2433b874d9b052ebcea6fab0e26 (diff)
Merge release-20200818.0-116-g86c1ae095 (automated)
Diffstat (limited to 'pkg/sentry/time')
-rw-r--r--pkg/sentry/time/seqatomic_parameters_unsafe.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/sentry/time/seqatomic_parameters_unsafe.go b/pkg/sentry/time/seqatomic_parameters_unsafe.go
index 14978ed91..f18440378 100644
--- a/pkg/sentry/time/seqatomic_parameters_unsafe.go
+++ b/pkg/sentry/time/seqatomic_parameters_unsafe.go
@@ -1,12 +1,12 @@
package time
import (
- "strings"
"unsafe"
"fmt"
"gvisor.dev/gvisor/pkg/sync"
"reflect"
+ "strings"
)
// SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race