summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/time
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-22 06:47:39 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-22 06:47:39 +0000
commit9a236b47f4e587d7526cb03bdd41e23b90223e97 (patch)
treeaebc0d090d2451687e1245b365f150f4d6d65ddc /pkg/sentry/time
parent19289f4d967517090c20720fea4c687909bdc58f (diff)
parent742e58b873dbb8d3c14b2e40f212df90ec837671 (diff)
Merge release-20200914.0-128-g742e58b87 (automated)
Diffstat (limited to 'pkg/sentry/time')
-rw-r--r--pkg/sentry/time/seqatomic_parameters_unsafe.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/sentry/time/seqatomic_parameters_unsafe.go b/pkg/sentry/time/seqatomic_parameters_unsafe.go
index 5eb560f57..14978ed91 100644
--- a/pkg/sentry/time/seqatomic_parameters_unsafe.go
+++ b/pkg/sentry/time/seqatomic_parameters_unsafe.go
@@ -1,12 +1,12 @@
package time
import (
- "reflect"
"strings"
"unsafe"
"fmt"
"gvisor.dev/gvisor/pkg/sync"
+ "reflect"
)
// SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race