summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/time
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2019-08-22 02:15:30 +0000
committergVisor bot <gvisor-bot@google.com>2019-08-22 02:15:30 +0000
commit79bc2dcf55ce73ab18ff955a4e66cd1c7ced3897 (patch)
tree3cbfd46ba24e313999d295e7d0b7f9ca60bf0375 /pkg/sentry/time
parent0a7fc51325ae9decfa6fb0f4beabc4c5deeac3ab (diff)
parent5fd63d1c7fc8ea8d0aff30abc6403aa4491b6f81 (diff)
Merge 5fd63d1c (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