summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/time
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-22 15:44:22 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-22 15:44:22 +0000
commita425892df3749c96c8557546f185358c2f784a66 (patch)
tree09906f2e7ae5017078d516c07e2ba128f1b41f6b /pkg/sentry/time
parent9a236b47f4e587d7526cb03bdd41e23b90223e97 (diff)
parentf134f873fc75f941405de7d0e046852a38795bec (diff)
Merge release-20200914.0-129-gf134f873f (automated)
Diffstat (limited to 'pkg/sentry/time')
-rw-r--r--pkg/sentry/time/seqatomic_parameters_unsafe.go5
1 files changed, 2 insertions, 3 deletions
diff --git a/pkg/sentry/time/seqatomic_parameters_unsafe.go b/pkg/sentry/time/seqatomic_parameters_unsafe.go
index 14978ed91..88d6b5569 100644
--- a/pkg/sentry/time/seqatomic_parameters_unsafe.go
+++ b/pkg/sentry/time/seqatomic_parameters_unsafe.go
@@ -1,12 +1,11 @@
package time
import (
- "strings"
- "unsafe"
-
"fmt"
"gvisor.dev/gvisor/pkg/sync"
"reflect"
+ "strings"
+ "unsafe"
)
// SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race