diff options
| author | gVisor bot <gvisor-bot@google.com> | 2019-06-25 04:52:36 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-06-25 04:52:36 +0000 |
| commit | 97b3e461d427c10537f58755bc1b307a5548b092 (patch) | |
| tree | b0eb6a83a9a4ab9f614aa73100758edf1467a370 /pkg | |
| parent | fa64387eb7da8f6f44e2979b8a98ae8a4403bf15 (diff) | |
| parent | fd16a329ce0c9fa1e7dd4c0fc1edc201f4c19571 (diff) | |
Merge fd16a329 (automated)
Diffstat (limited to 'pkg')
| -rwxr-xr-x | pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo.go | 6 | ||||
| -rwxr-xr-x | pkg/sentry/time/seqatomic_parameters.go | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo.go b/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo.go index 25ad17a4e..895abb129 100755 --- a/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo.go +++ b/pkg/sentry/kernel/seqatomic_taskgoroutineschedinfo.go @@ -1,12 +1,12 @@ package kernel import ( - "fmt" - "reflect" - "strings" "unsafe" + "fmt" "gvisor.dev/gvisor/third_party/gvsync" + "reflect" + "strings" ) // 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 89792c56d..f6560d0bb 100755 --- a/pkg/sentry/time/seqatomic_parameters.go +++ b/pkg/sentry/time/seqatomic_parameters.go @@ -1,12 +1,12 @@ package time import ( - "fmt" - "reflect" - "strings" "unsafe" + "fmt" "gvisor.dev/gvisor/third_party/gvsync" + "reflect" + "strings" ) // SeqAtomicLoad returns a copy of *ptr, ensuring that the read does not race |