diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-06 03:31:33 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-06 03:31:33 +0300 |
| commit | af6c5d5e01ad9f2c9ca38cccaae6b5d67ddd241f (patch) | |
| tree | 5bfdb1ee5c0b904732929eae55fe6da13bd273d5 /fs/proc/internal.h | |
| parent | 9f25a8da423226d7797e35a132535186c531228b (diff) | |
| parent | 66448bc274cadedb71fda7d914e7c29d8dead217 (diff) | |
| download | linux-af6c5d5e01ad9f2c9ca38cccaae6b5d67ddd241f.tar.xz | |
Merge branch 'for-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
Pull workqueue updates from Tejun Heo:
- make kworkers report the workqueue it is executing or has executed
most recently in /proc/PID/comm (so they show up in ps/top)
- CONFIG_SMP shuffle to move stuff which isn't necessary for UP builds
inside CONFIG_SMP.
* 'for-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
workqueue: move function definitions within CONFIG_SMP block
workqueue: Make sure struct worker is accessible for wq_worker_comm()
workqueue: Show the latest workqueue name in /proc/PID/{comm,stat,status}
proc: Consolidate task->comm formatting into proc_task_name()
workqueue: Set worker->desc to workqueue name by default
workqueue: Make worker_attach/detach_pool() update worker->pool
workqueue: Replace pool->attach_mutex with global wq_pool_attach_mutex
Diffstat (limited to 'fs/proc/internal.h')
| -rw-r--r-- | fs/proc/internal.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/proc/internal.h b/fs/proc/internal.h index 43c70c9e6b62..93eb1906c28d 100644 --- a/fs/proc/internal.h +++ b/fs/proc/internal.h @@ -136,6 +136,8 @@ unsigned name_to_int(const struct qstr *qstr); */ extern const struct file_operations proc_tid_children_operations; +extern void proc_task_name(struct seq_file *m, struct task_struct *p, + bool escape); extern int proc_tid_stat(struct seq_file *, struct pid_namespace *, struct pid *, struct task_struct *); extern int proc_tgid_stat(struct seq_file *, struct pid_namespace *, |