diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-11-29 10:00:54 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-11-29 10:00:54 +0300 |
commit | 5d331b5922551637c586cdf5fdc1778910fc937f (patch) | |
tree | 8f7514513f7ac2f76373a103054f04042d19d3b8 /include/linux/sched/task.h | |
parent | cd455ebb748c4e198c8158e5d61b3034bf10f22b (diff) | |
parent | d58071a8a76d779eedab38033ae4c821c30295a5 (diff) | |
download | linux-5d331b5922551637c586cdf5fdc1778910fc937f.tar.xz |
Merge 5.16-rc3 into char-misc-next
We need the char/misc fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/sched/task.h')
-rw-r--r-- | include/linux/sched/task.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/sched/task.h b/include/linux/sched/task.h index ba88a6987400..058d7f371e25 100644 --- a/include/linux/sched/task.h +++ b/include/linux/sched/task.h @@ -158,7 +158,7 @@ static inline struct vm_struct *task_stack_vm_area(const struct task_struct *t) * Protects ->fs, ->files, ->mm, ->group_info, ->comm, keyring * subscriptions and synchronises with wait4(). Also used in procfs. Also * pins the final release of task.io_context. Also protects ->cpuset and - * ->cgroup.subsys[]. And ->vfork_done. + * ->cgroup.subsys[]. And ->vfork_done. And ->sysvshm.shm_clist. * * Nests both inside and outside of read_lock(&tasklist_lock). * It must not be nested with write_lock_irq(&tasklist_lock), |