summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/time
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-18 17:30:59 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-18 17:30:59 +0000
commit7557ec18a717f0a6cc1967706fb718c75388e71e (patch)
tree0711e40d29431e8886b5987f319a2a97a3910d5b /pkg/sentry/time
parent7d824eb860280a47646b73f71af2811f7e2c0d55 (diff)
parent93fd164fa24e1f70e4c69fc2edfb0d4961a6683b (diff)
Merge release-20200907.0-141-g93fd164fa (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