summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/time
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-18 23:26:12 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-18 23:26:12 +0000
commit1150452ee5b96f836331399976805e356fb18f4f (patch)
tree5f932664eb16315b1671d8ab0e6c656d907257b3 /pkg/sentry/time
parentc4ecfe7303a9c4926695873200fd522b3c2c816a (diff)
parent4ba86e62580756d3f37205bbb09da5125ff04835 (diff)
Merge release-20200907.0-153-g4ba86e625 (automated)
Diffstat (limited to 'pkg/sentry/time')
-rw-r--r--pkg/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 2cb001080..14978ed91 100644
--- 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/pkg/sync"
+ "reflect"
)
// SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race