Merge commit 'v2.6.36' into kbuild/misc

Update to be able to fix a recent change to scripts/basic/docproc.c
(commit eda603f).

1 files changed, 9 insertions, 0 deletions

diff --git a/include/linux/resource.h b/include/linux/resource.h
index f1e914eefeab..88d36f9145ba 100644
--- a/include/linux/resource.h
+++ b/include/linux/resource.h
@@ -43,6 +43,13 @@ struct rlimit {
         unsigned long   rlim_max;
 };
 
+#define RLIM64_INFINITY         (~0ULL)
+
+struct rlimit64 {
+        __u64 rlim_cur;
+        __u64 rlim_max;
+};
+
 #define PRIO_MIN        (-20)
 #define PRIO_MAX        20
 
@@ -73,6 +80,8 @@ struct rlimit {
 struct task_struct;
 
 int getrusage(struct task_struct *p, int who, struct rusage __user *ru);
+int do_prlimit(struct task_struct *tsk, unsigned int resource,
+                struct rlimit *new_rlim, struct rlimit *old_rlim);
 
 #endif /* __KERNEL__ */