summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/time
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-02-10 18:45:27 +0000
committergVisor bot <gvisor-bot@google.com>2020-02-10 18:45:27 +0000
commit4e35cec594269cd87c35bfdd8ddde5c51b7621df (patch)
tree7891431b6557c15c75b1550a246a892b23f4c47c /pkg/sentry/time
parent71745b185421972b30d54e048a4ea7e19fe19e20 (diff)
parent223931da847f0ad25b44e18fb59da3391d028139 (diff)
Merge release-20200127.0-102-g223931d (automated)
Diffstat (limited to 'pkg/sentry/time')
-rwxr-xr-xpkg/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 100755
--- 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