summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/time
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-17 19:08:05 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-17 19:08:05 +0000
commit5ecebda34332d0368794efe3f4e30e4fbbe523a0 (patch)
treefac9be03c9f4156ca12fea4ab14aaff8f888bc0d /pkg/sentry/time
parentc346af254716333f3a5820a720a195c770ae2204 (diff)
Merge release-20200907.0-123-gf0b1bd434 (automated)
Diffstat (limited to 'pkg/sentry/time')
-rw-r--r--pkg/sentry/time/seqatomic_parameters_unsafe.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkg/sentry/time/seqatomic_parameters_unsafe.go b/pkg/sentry/time/seqatomic_parameters_unsafe.go
index 88d6b5569..5eb560f57 100644
--- a/pkg/sentry/time/seqatomic_parameters_unsafe.go
+++ b/pkg/sentry/time/seqatomic_parameters_unsafe.go
@@ -1,11 +1,12 @@
package time
import (
- "fmt"
- "gvisor.dev/gvisor/pkg/sync"
"reflect"
"strings"
"unsafe"
+
+ "fmt"
+ "gvisor.dev/gvisor/pkg/sync"
)
// SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race