summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/time
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-18 19:23:40 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-18 19:23:40 +0000
commit7d83427b10c1cdbd603c2814b5f674e819dd6fb6 (patch)
tree145b273bcd22244b5db9cbbcf175007328ea856f /pkg/sentry/time
parent4f22bb9ec7cf0b8137f499f2312222e19d6ba3d1 (diff)
parentf911b43f05f88807a1e36adc6ab3b7c8cf8ec2ee (diff)
Merge release-20200907.0-147-gf911b43f0 (automated)
Diffstat (limited to 'pkg/sentry/time')
-rw-r--r--pkg/sentry/time/seqatomic_parameters_unsafe.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/time/seqatomic_parameters_unsafe.go b/pkg/sentry/time/seqatomic_parameters_unsafe.go
index 14978ed91..2cb001080 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"
)
// SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race