summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2021-07-09 23:05:04 +0000
committergVisor bot <gvisor-bot@google.com>2021-07-09 23:05:04 +0000
commita6333d999d80e980576c11a558b69ad3106952d2 (patch)
treec0bfcad340c0593353f0f2549b968d5aa5d53214
parentef96bb2d4957442a326b3610a3e247a33ae5aaff (diff)
parentd78713e2da5331a22fc51fb9a9ad33cc1873879c (diff)
Merge release-20210628.0-34-gd78713e2d (automated)
-rw-r--r--pkg/sentry/kernel/task_cgroup.go2
1 files changed, 0 insertions, 2 deletions
diff --git a/pkg/sentry/kernel/task_cgroup.go b/pkg/sentry/kernel/task_cgroup.go
index 7dd6d3108..828b90014 100644
--- a/pkg/sentry/kernel/task_cgroup.go
+++ b/pkg/sentry/kernel/task_cgroup.go
@@ -27,8 +27,6 @@ import (
// EnterInitialCgroups moves t into an initial set of cgroups.
//
// Precondition: t isn't in any cgroups yet, t.cgs is empty.
-//
-// +checklocksignore parent.mu is conditionally acquired.
func (t *Task) EnterInitialCgroups(parent *Task) {
var inherit map[Cgroup]struct{}
if parent != nil {