summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/time
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2019-07-17 18:23:01 +0000
committergVisor bot <gvisor-bot@google.com>2019-07-17 18:23:01 +0000
commit67b38012014bbc8774e04dd2942d6111b8e9f401 (patch)
treec70c44195eb6059f53972c7e9ba9611a49d608b9 /pkg/sentry/time
parent7126e351b80d9826a7b0eb29ad85d8036d311d54 (diff)
parentca829158e385c591d4be21c87cc6ab45116a7cce (diff)
Merge ca829158 (automated)
Diffstat (limited to 'pkg/sentry/time')
-rwxr-xr-xpkg/sentry/time/seqatomic_parameters_unsafe.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkg/sentry/time/seqatomic_parameters_unsafe.go b/pkg/sentry/time/seqatomic_parameters_unsafe.go
index b4fb0a7f0..f6560d0bb 100755
--- a/pkg/sentry/time/seqatomic_parameters_unsafe.go
+++ b/pkg/sentry/time/seqatomic_parameters_unsafe.go
@@ -1,11 +1,12 @@
package time
import (
+ "unsafe"
+
"fmt"
"gvisor.dev/gvisor/third_party/gvsync"
"reflect"
"strings"
- "unsafe"
)
// SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race