summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/time
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2019-08-13 19:05:09 +0000
committergVisor bot <gvisor-bot@google.com>2019-08-13 19:05:09 +0000
commit92d492e8e71f1348108bd91598ae6b4de73e3832 (patch)
tree097940d9ef3c3bfc76099505a25a5340219b6afc /pkg/sentry/time
parent3b7346145bcb48b8fb648e9b598ab3350002a754 (diff)
parent8d97b22aa8e565ff05c5e9209f13d2394e9706c8 (diff)
Merge 8d97b22a (automated)
Diffstat (limited to 'pkg/sentry/time')
-rwxr-xr-xpkg/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 89792c56d..fb30a22c6 100755
--- 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/third_party/gvsync"
+ "reflect"
)
// SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race