summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/time
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2019-10-21 20:33:57 +0000
committergVisor bot <gvisor-bot@google.com>2019-10-21 20:33:57 +0000
commitb0dbb71b3db5e1acfda91673a9b09e15cacdf9ca (patch)
tree4bdf04ac4a270016b9159c4c63a4351c49973792 /pkg/sentry/time
parent975132cced68da837aea09743d45a103be1789c7 (diff)
parenta9358ce81fca1c99449ce6fd28faf3f04baf6104 (diff)
Merge release-20190806.1-296-ga9358ce (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