diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-07 01:15:42 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-07 01:15:42 -0500 |
commit | a2e5790d841658485d642196dbb0927303d6c22f (patch) | |
tree | b3d28c9bcb7da6880806146fd22a88a7ee7f733e /include/linux/sched.h | |
parent | ab2d92ad881da11331280aedf612d82e61cb6d41 (diff) | |
parent | 60c3e026d73ccabb075fb70ba02f8512ab40cf2c (diff) |
Merge branch 'akpm' (patches from Andrew)
Merge misc updates from Andrew Morton:
- kasan updates
- procfs
- lib/bitmap updates
- other lib/ updates
- checkpatch tweaks
- rapidio
- ubsan
- pipe fixes and cleanups
- lots of other misc bits
* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (114 commits)
Documentation/sysctl/user.txt: fix typo
MAINTAINERS: update ARM/QUALCOMM SUPPORT patterns
MAINTAINERS: update various PALM patterns
MAINTAINERS: update "ARM/OXNAS platform support" patterns
MAINTAINERS: update Cortina/Gemini patterns
MAINTAINERS: remove ARM/CLKDEV SUPPORT file pattern
MAINTAINERS: remove ANDROID ION pattern
mm: docs: add blank lines to silence sphinx "Unexpected indentation" errors
mm: docs: fix parameter names mismatch
mm: docs: fixup punctuation
pipe: read buffer limits atomically
pipe: simplify round_pipe_size()
pipe: reject F_SETPIPE_SZ with size over UINT_MAX
pipe: fix off-by-one error when checking buffer limits
pipe: actually allow root to exceed the pipe buffer limits
pipe, sysctl: remove pipe_proc_fn()
pipe, sysctl: drop 'min' parameter from pipe-max-size converter
kasan: rework Kconfig settings
crash_dump: is_kdump_kernel can be boolean
kernel/mutex: mutex_is_locked can be boolean
...
Diffstat (limited to 'include/linux/sched.h')
-rw-r--r-- | include/linux/sched.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 92744e3f1556..b161ef8a902e 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
@@ -1497,6 +1497,11 @@ static inline struct thread_info *task_thread_info(struct task_struct *task) | |||
1497 | extern struct task_struct *find_task_by_vpid(pid_t nr); | 1497 | extern struct task_struct *find_task_by_vpid(pid_t nr); |
1498 | extern struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns); | 1498 | extern struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns); |
1499 | 1499 | ||
1500 | /* | ||
1501 | * find a task by its virtual pid and get the task struct | ||
1502 | */ | ||
1503 | extern struct task_struct *find_get_task_by_vpid(pid_t nr); | ||
1504 | |||
1500 | extern int wake_up_state(struct task_struct *tsk, unsigned int state); | 1505 | extern int wake_up_state(struct task_struct *tsk, unsigned int state); |
1501 | extern int wake_up_process(struct task_struct *tsk); | 1506 | extern int wake_up_process(struct task_struct *tsk); |
1502 | extern void wake_up_new_task(struct task_struct *tsk); | 1507 | extern void wake_up_new_task(struct task_struct *tsk); |