diff options
author | gVisor bot <gvisor-bot@google.com> | 2020-09-15 19:15:41 +0000 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2020-09-15 19:15:41 +0000 |
commit | 08bd313149dc0d67781b15742ed064f560897518 (patch) | |
tree | a135d25f383e55775ea9beb0f1e51e01e54ba010 /pkg/sentry/time | |
parent | f19f2d16c58ef3a3e20344dfb366971724a81eab (diff) | |
parent | 84d48c0fddc35e82bf8760acd366509581513274 (diff) |
Merge release-20200907.0-46-g84d48c0fd (automated)
Diffstat (limited to 'pkg/sentry/time')
-rw-r--r-- | pkg/sentry/time/seqatomic_parameters_unsafe.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkg/sentry/time/seqatomic_parameters_unsafe.go b/pkg/sentry/time/seqatomic_parameters_unsafe.go index 2cb001080..88d6b5569 100644 --- a/pkg/sentry/time/seqatomic_parameters_unsafe.go +++ b/pkg/sentry/time/seqatomic_parameters_unsafe.go @@ -2,11 +2,10 @@ package time import ( "fmt" + "gvisor.dev/gvisor/pkg/sync" "reflect" "strings" "unsafe" - - "gvisor.dev/gvisor/pkg/sync" ) // SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race |