summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/time
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-03 02:41:36 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-03 02:41:36 +0000
commitf4dac3c3846985701f21b36ed089c0bf48b618fc (patch)
tree81fea9bd6dfc252eac7cfb582f79a8607cf30757 /pkg/sentry/time
parentfc17010ccd4fb5b2593a2bf18bcfc9ce4ee2f8c7 (diff)
parenta8c174c04751799514ec2e89111e7d03ddf68b70 (diff)
Merge release-20200818.0-117-ga8c174c04 (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 f18440378..5eb560f57 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"
- "strings"
)
// SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race