summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/time
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-18 18:24:16 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-18 18:24:16 +0000
commit4f22bb9ec7cf0b8137f499f2312222e19d6ba3d1 (patch)
tree7c91b648566b0147bda5044dd3a72287be503ad9 /pkg/sentry/time
parent1b75140844fb3973996b52384778fd0567ccf895 (diff)
parentddf37cb19f373ae47836db97349013081cc857b4 (diff)
Merge release-20200907.0-146-gddf37cb19 (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 2cb001080..14978ed91 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