summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/time
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-06-06 03:52:29 +0000
committergVisor bot <gvisor-bot@google.com>2020-06-06 03:52:29 +0000
commit35a850f06feca1014e6ec7fcf0f3576237dd6ad9 (patch)
tree372186c40ce0daf645635d71af55fc275d48da8b /pkg/sentry/time
parent3fd0d124a05da2850ba2f1fb2e367d16266a5bf5 (diff)
parent427d2082165e0949a00631a50cf5f6834d3d626d (diff)
Merge release-20200522.0-91-g427d2082 (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 efd3ccae2..57641d019 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