diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-03 18:00:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-03 18:00:13 -0700 |
| commit | d92cd810e64aa7cf22b05f0ea1c7d3e8dbae75fe (patch) | |
| tree | 592e040010a30d1dbce4e54eb597011af0df290e /include/linux/cgroup-defs.h | |
| parent | a23867f1d2de572f84b459651dfe99fa9e79fadf (diff) | |
| parent | f75da8a8a918d7c343a2ec95d1ed99e5689e0f23 (diff) | |
| download | lwn-d92cd810e64aa7cf22b05f0ea1c7d3e8dbae75fe.tar.gz lwn-d92cd810e64aa7cf22b05f0ea1c7d3e8dbae75fe.zip | |
Merge branch 'for-4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
Pull workqueue updates from Tejun Heo:
"rcu_work addition and a couple trivial changes"
* 'for-4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
workqueue: remove the comment about the old manager_arb mutex
workqueue: fix the comments of nr_idle
fs/aio: Use rcu_work instead of explicit rcu and work item
cgroup: Use rcu_work instead of explicit rcu and work item
RCU, workqueue: Implement rcu_work
Diffstat (limited to 'include/linux/cgroup-defs.h')
| -rw-r--r-- | include/linux/cgroup-defs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/cgroup-defs.h b/include/linux/cgroup-defs.h index f8e76d01a5ad..dc5b70449dc6 100644 --- a/include/linux/cgroup-defs.h +++ b/include/linux/cgroup-defs.h @@ -151,8 +151,8 @@ struct cgroup_subsys_state { atomic_t online_cnt; /* percpu_ref killing and RCU release */ - struct rcu_head rcu_head; struct work_struct destroy_work; + struct rcu_work destroy_rwork; /* * PI: the parent css. Placed here for cache proximity to following |