summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/time
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-11 23:13:20 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-11 23:13:20 +0000
commit2c7d03d2378865ee92d7ae24e48748f17233e783 (patch)
treef84e553a41525dd9dc4dc64f6b6fb1bbdf1481a8 /pkg/sentry/time
parent51194daa8da2bee362c9ecb6491016038e5f8436 (diff)
parent1f4fb817c8ff8be7239a99baff01d8f20b2e9abd (diff)
Merge release-20200907.0-36-g1f4fb817c (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