summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/time
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-15 21:58:34 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-15 21:58:34 +0000
commit0c8d10699e1bf4f4f1e6f9fb7fdd4ec1a961daf3 (patch)
treed9c266cb2ab8821481a7b2192ea1d00f903c3a8c /pkg/sentry/time
parent13ae2c44c4ad37021e248c184ed2a4f7efa4d0c7 (diff)
parenta004f0d082458ce98114b59a3e5d41c2e74541d6 (diff)
Merge release-20200907.0-51-ga004f0d08 (automated)
Diffstat (limited to 'pkg/sentry/time')
-rw-r--r--pkg/sentry/time/seqatomic_parameters_unsafe.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/sentry/time/seqatomic_parameters_unsafe.go b/pkg/sentry/time/seqatomic_parameters_unsafe.go
index 2cb001080..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 (
- "fmt"
- "reflect"
- "strings"
"unsafe"
+ "fmt"
"gvisor.dev/gvisor/pkg/sync"
+ "reflect"
+ "strings"
)
// SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race