diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2017-05-27 16:22:20 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2017-05-27 16:22:20 -0400 |
| commit | 33dd955df2d35bfca0fc851bcde9189839eb687a (patch) | |
| tree | a06379ac5a9df04f03c8a150b58e79a5a8e69e88 /include | |
| parent | 9ba3eb5103cf56f0daaf07de4507df76e7813ed7 (diff) | |
| parent | 92ebce5ac55dba258c608248dddf59eca3f7f514 (diff) | |
Merge branch 'work.sys_wait' into misc.alpha
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/resource.h | 2 | ||||
| -rw-r--r-- | include/linux/sched/task.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/resource.h b/include/linux/resource.h index 5bc3116e649c..277afdad6589 100644 --- a/include/linux/resource.h +++ b/include/linux/resource.h @@ -6,7 +6,7 @@ struct task_struct; -int getrusage(struct task_struct *p, int who, struct rusage __user *ru); +void getrusage(struct task_struct *p, int who, struct rusage *ru); int do_prlimit(struct task_struct *tsk, unsigned int resource, struct rlimit *new_rlim, struct rlimit *old_rlim); diff --git a/include/linux/sched/task.h b/include/linux/sched/task.h index a978d7189cfd..6b830fd9d809 100644 --- a/include/linux/sched/task.h +++ b/include/linux/sched/task.h @@ -9,6 +9,7 @@ #include <linux/sched.h> struct task_struct; +struct rusage; union thread_union; /* @@ -74,6 +75,7 @@ extern long _do_fork(unsigned long, unsigned long, unsigned long, int __user *, extern long do_fork(unsigned long, unsigned long, unsigned long, int __user *, int __user *); struct task_struct *fork_idle(int); extern pid_t kernel_thread(int (*fn)(void *), void *arg, unsigned long flags); +extern long kernel_wait4(pid_t, int *, int, struct rusage *); extern void free_task(struct task_struct *tsk); |