summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/time
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2019-08-28 22:05:09 +0000
committergVisor bot <gvisor-bot@google.com>2019-08-28 22:05:09 +0000
commit68880c0402d9104a30afde5261c72523753ef5de (patch)
treea91418f0e1180d8aaad962829cb1c9d705cf545a /pkg/sentry/time
parent9e78afdfef6e4ca77c4616f5432a295dfb15e5ae (diff)
parent24ecce5dbf7673ab09669aae06d78d455862d47a (diff)
Merge 24ecce5d (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