summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/time
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-19 03:56:42 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-19 03:56:42 +0000
commit3525b46a2c7050c992852f1b1958173653e3280d (patch)
treeb97190a8bf4b6c0c592b9ca3a8cc6c95bd3bebe0 /pkg/sentry/time
parent1150452ee5b96f836331399976805e356fb18f4f (diff)
parent916751039cca927a0e64b4e6f776d2d4732cf8d8 (diff)
Merge release-20200907.0-154-g916751039 (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