summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/time
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2019-08-29 21:38:30 +0000
committergVisor bot <gvisor-bot@google.com>2019-08-29 21:38:30 +0000
commit257dea5e4ff674bd6b56c9386799763b23a9f275 (patch)
tree5e83904b9971b68bca7b9c48602d4f0eb4cbf2f2 /pkg/sentry/time
parent2fb00dc310329e0f8bc76626f2c48eacf8531e67 (diff)
parent863e11ac4d6a49787cd5e5f6fe1cd771d0ceb100 (diff)
Merge 863e11ac (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