summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/time
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-11 20:04:55 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-11 20:04:55 +0000
commit0f537dcf1bc73a014e37175ee8f4142ed2373ad4 (patch)
tree31b4106e4381729d710c0aac5cb98bbf999aaf2b /pkg/sentry/time
parent4a40751d1128b1b7df3c8bed9c00834682d67c53 (diff)
parent9a5635eb179f3a21c51e912aa87277025d7950e9 (diff)
Merge release-20200907.0-33-g9a5635eb1 (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