diff options
| author | gVisor bot <gvisor-bot@google.com> | 2019-06-12 16:49:53 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-06-12 16:49:53 +0000 |
| commit | 095902985ff143b8ec34691c30e735f62521ee4c (patch) | |
| tree | cd39d992f8cd96efe5fd9a15755ae458c3e727c5 /pkg | |
| parent | 19b473c6e2fe412c0e96c8b9e4672922da19471a (diff) | |
| parent | 356d1be140bb51f2a50d2c7fe24242cbfeedc9d6 (diff) | |
Merge 356d1be1 (automated)
Diffstat (limited to 'pkg')
| -rwxr-xr-x | pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo.go | 3 | ||||
| -rwxr-xr-x | pkg/sentry/time/seqatomic_parameters.go | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo.go b/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo.go index 532b33b9e..5b4ad3062 100755 --- a/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo.go +++ b/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo.go @@ -2,10 +2,11 @@ package kernel import ( "fmt" - "gvisor.googlesource.com/gvisor/third_party/gvsync" "reflect" "strings" "unsafe" + + "gvisor.googlesource.com/gvisor/third_party/gvsync" ) // SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race diff --git a/pkg/sentry/time/seqatomic_parameters.go b/pkg/sentry/time/seqatomic_parameters.go index f142c681a..54152a39a 100755 --- a/pkg/sentry/time/seqatomic_parameters.go +++ b/pkg/sentry/time/seqatomic_parameters.go @@ -2,10 +2,11 @@ package time import ( "fmt" - "gvisor.googlesource.com/gvisor/third_party/gvsync" "reflect" "strings" "unsafe" + + "gvisor.googlesource.com/gvisor/third_party/gvsync" ) // SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race |