diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-24 13:19:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-24 13:19:27 -0700 |
| commit | 596766102a3a37ba20c4d9a4130a8a4b42b34646 (patch) | |
| tree | 52208e97359079e345b3d9b6750bc17d545c6c8c /kernel/cgroup/cgroup-v1.c | |
| parent | Merge branch 'for-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq (diff) | |
| parent | cgroup/tracing: Move taking of spin lock out of trace event handlers (diff) | |
| download | linux-dev-596766102a3a37ba20c4d9a4130a8a4b42b34646.tar.xz linux-dev-596766102a3a37ba20c4d9a4130a8a4b42b34646.zip | |
Merge branch 'for-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup updates from Tejun Heo:
"Just one commit from Steven to take out spin lock from trace event
handlers"
* 'for-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
cgroup/tracing: Move taking of spin lock out of trace event handlers
Diffstat (limited to 'kernel/cgroup/cgroup-v1.c')
| -rw-r--r-- | kernel/cgroup/cgroup-v1.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/cgroup/cgroup-v1.c b/kernel/cgroup/cgroup-v1.c index 8b4f0768efd6..51063e7a93c2 100644 --- a/kernel/cgroup/cgroup-v1.c +++ b/kernel/cgroup/cgroup-v1.c @@ -135,7 +135,7 @@ int cgroup_transfer_tasks(struct cgroup *to, struct cgroup *from) if (task) { ret = cgroup_migrate(task, false, &mgctx); if (!ret) - trace_cgroup_transfer_tasks(to, task, false); + TRACE_CGROUP_PATH(transfer_tasks, to, task, false); put_task_struct(task); } } while (task && !ret); @@ -865,7 +865,7 @@ static int cgroup1_rename(struct kernfs_node *kn, struct kernfs_node *new_parent ret = kernfs_rename(kn, new_parent, new_name_str); if (!ret) - trace_cgroup_rename(cgrp); + TRACE_CGROUP_PATH(rename, cgrp); mutex_unlock(&cgroup_mutex); |