diff options
| author | gVisor bot <gvisor-bot@google.com> | 2019-09-03 18:40:20 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-09-03 18:40:20 +0000 |
| commit | b6ef2d327db040c30894ff412dd9b387429ef0ef (patch) | |
| tree | bb8d9b822a06c1315ea26d01054d8d29161a99c8 /pkg/sentry | |
| parent | 15bc1f77009efefdd417e986507f74f6efd629a4 (diff) | |
| parent | 648170f527c4dc57f6dcf35bdb13e31b99ca022c (diff) | |
Merge 648170f5 (automated)
Diffstat (limited to 'pkg/sentry')
| -rwxr-xr-x | pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo_unsafe.go | 2 | ||||
| -rwxr-xr-x | pkg/sentry/time/seqatomic_parameters_unsafe.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo_unsafe.go b/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo_unsafe.go index 24528b66a..c284a1b11 100755 --- a/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo_unsafe.go +++ b/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo_unsafe.go @@ -1,12 +1,12 @@ package kernel import ( + "reflect" "strings" "unsafe" "fmt" "gvisor.dev/gvisor/third_party/gvsync" - "reflect" ) // SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race diff --git a/pkg/sentry/time/seqatomic_parameters_unsafe.go b/pkg/sentry/time/seqatomic_parameters_unsafe.go index fb30a22c6..1ec221edd 100755 --- a/pkg/sentry/time/seqatomic_parameters_unsafe.go +++ b/pkg/sentry/time/seqatomic_parameters_unsafe.go @@ -1,12 +1,12 @@ package time import ( + "reflect" "strings" "unsafe" "fmt" "gvisor.dev/gvisor/third_party/gvsync" - "reflect" ) // SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race |