summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/time
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-08 22:57:18 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-08 22:57:18 +0000
commit62a9aa08479cd797206ff812191b2d9472d2a737 (patch)
tree251cf1f4e82c97bd236be63b064fcb681505e710 /pkg/sentry/time
parentb6dfbd39e22978a9f70960d60c1a7ab5ab770a67 (diff)
parent360f1535c761650657d406bf68f15498118d8222 (diff)
Merge release-20200818.0-134-g360f1535c (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