summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/time
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2019-06-21 19:34:51 +0000
committergVisor bot <gvisor-bot@google.com>2019-06-21 19:34:51 +0000
commitfd1a65eddff66bf9ee8bdac2e00948f6784b7c1c (patch)
tree88a9b90cbabc6b44bea07db9451d51e188a26a5c /pkg/sentry/time
parentb42e4cc6700029d0fa8eea57c57c0acbee181596 (diff)
parentc0317b28cb3f8346ee81564ee477aafdf6283f45 (diff)
Merge c0317b28 (automated)
Diffstat (limited to 'pkg/sentry/time')
-rwxr-xr-xpkg/sentry/time/seqatomic_parameters.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/sentry/time/seqatomic_parameters.go b/pkg/sentry/time/seqatomic_parameters.go
index 89792c56d..f6560d0bb 100755
--- a/pkg/sentry/time/seqatomic_parameters.go
+++ b/pkg/sentry/time/seqatomic_parameters.go
@@ -1,12 +1,12 @@
package time
import (
- "fmt"
- "reflect"
- "strings"
"unsafe"
+ "fmt"
"gvisor.dev/gvisor/third_party/gvsync"
+ "reflect"
+ "strings"
)
// SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race