diff options
| author | gVisor bot <gvisor-bot@google.com> | 2019-11-21 19:43:52 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-11-21 19:43:52 +0000 |
| commit | b3f49ebd74ff30ad50b495ddd563ee5aa9cd2bca (patch) | |
| tree | ad383037abfddbfeb8a11229eb1637909b25002e /pkg/sentry/kernel/task.go | |
| parent | 158f38053d931caf57b90bb0b496cf7d2ec4d42b (diff) | |
| parent | c0f89eba6ebdec08460bd796fc62d6aef674d141 (diff) | |
Merge release-20191114.0-18-gc0f89eb (automated)
Diffstat (limited to 'pkg/sentry/kernel/task.go')
| -rw-r--r-- | pkg/sentry/kernel/task.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/kernel/task.go b/pkg/sentry/kernel/task.go index 9be3dae3c..80c8e5464 100644 --- a/pkg/sentry/kernel/task.go +++ b/pkg/sentry/kernel/task.go @@ -35,8 +35,8 @@ import ( "gvisor.dev/gvisor/pkg/sentry/uniqueid" "gvisor.dev/gvisor/pkg/sentry/usage" "gvisor.dev/gvisor/pkg/sentry/usermem" + "gvisor.dev/gvisor/pkg/syncutil" "gvisor.dev/gvisor/pkg/waiter" - "gvisor.dev/gvisor/third_party/gvsync" ) // Task represents a thread of execution in the untrusted app. It @@ -83,7 +83,7 @@ type Task struct { // // gosched is protected by goschedSeq. gosched is owned by the task // goroutine. - goschedSeq gvsync.SeqCount `state:"nosave"` + goschedSeq syncutil.SeqCount `state:"nosave"` gosched TaskGoroutineSchedInfo // yieldCount is the number of times the task goroutine has called |