summaryrefslogtreecommitdiff
path: root/include/linux/resource.h
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2017-05-27 23:22:20 +0300
committerAl Viro <viro@zeniv.linux.org.uk>2017-05-27 23:22:20 +0300
commit33dd955df2d35bfca0fc851bcde9189839eb687a (patch)
treea06379ac5a9df04f03c8a150b58e79a5a8e69e88 /include/linux/resource.h
parent9ba3eb5103cf56f0daaf07de4507df76e7813ed7 (diff)
parent92ebce5ac55dba258c608248dddf59eca3f7f514 (diff)
downloadlinux-33dd955df2d35bfca0fc851bcde9189839eb687a.tar.xz
Merge branch 'work.sys_wait' into misc.alpha
Diffstat (limited to 'include/linux/resource.h')
-rw-r--r--include/linux/resource.h2
1 files changed, 1 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);