diff options
| author | Kevin Krakauer <krakauer@google.com> | 2020-01-13 12:22:15 -0800 |
|---|---|---|
| committer | Kevin Krakauer <krakauer@google.com> | 2020-01-13 12:22:15 -0800 |
| commit | 31e49f4b19309259baeeb63e7b6ef41f8edd6d35 (patch) | |
| tree | ad6cae1ad4f173946eb68156653bea84d7254f81 /pkg/sentry/kernel/task.go | |
| parent | d147e6d1b29d25607bcdcdb0beddb5122fea085e (diff) | |
| parent | b30cfb1df72e201c6caf576bbef8fcc968df2d41 (diff) | |
Merge branch 'master' into iptables-write-input-drop
Diffstat (limited to 'pkg/sentry/kernel/task.go')
| -rw-r--r-- | pkg/sentry/kernel/task.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkg/sentry/kernel/task.go b/pkg/sentry/kernel/task.go index d25a7903b..978d66da8 100644 --- a/pkg/sentry/kernel/task.go +++ b/pkg/sentry/kernel/task.go @@ -17,7 +17,6 @@ package kernel import ( gocontext "context" "runtime/trace" - "sync" "sync/atomic" "gvisor.dev/gvisor/pkg/abi/linux" @@ -37,7 +36,7 @@ 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/sync" "gvisor.dev/gvisor/pkg/waiter" ) @@ -85,7 +84,7 @@ type Task struct { // // gosched is protected by goschedSeq. gosched is owned by the task // goroutine. - goschedSeq syncutil.SeqCount `state:"nosave"` + goschedSeq sync.SeqCount `state:"nosave"` gosched TaskGoroutineSchedInfo // yieldCount is the number of times the task goroutine has called |