summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/time
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-14 23:11:51 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-14 23:11:51 +0000
commit96ed05d6d25e612012cd19db2316652a1f639f49 (patch)
tree6b5facf042b98bb8afea7aa2ed7100f35cea69e4 /pkg/sentry/time
parent0c789429706f50a08dc524692037448c1e614887 (diff)
parent52ffeb2d6475fa2e427daf246abdd32e4825f3f8 (diff)
Merge release-20200907.0-43-g52ffeb2d6 (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 5eb560f57..f18440378 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