From c5c0702ac551e3ecf17dcd3efca331b1b1b7cedb Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jslaby@suse.cz>
Date: Thu, 19 Nov 2009 17:16:37 +0100
Subject: [PATCH] --- yaml --- r: 178762 b: refs/heads/master c:
 3e10e716abf3c71bdb5d86b8f507f9e72236c9cd h: refs/heads/master v: v3

---
 [refs]                      |  2 +-
 trunk/include/linux/sched.h | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a1d0cb9768e7..bfa275688c26 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96d07d211739fd2450ac54e81d00fa40fcd4b1bd
+refs/heads/master: 3e10e716abf3c71bdb5d86b8f507f9e72236c9cd
diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h
index f2f842db03ce..8d4991be9d53 100644
--- a/trunk/include/linux/sched.h
+++ b/trunk/include/linux/sched.h
@@ -2601,6 +2601,28 @@ static inline void mm_init_owner(struct mm_struct *mm, struct task_struct *p)
 }
 #endif /* CONFIG_MM_OWNER */
 
+static inline unsigned long task_rlimit(const struct task_struct *tsk,
+		unsigned int limit)
+{
+	return ACCESS_ONCE(tsk->signal->rlim[limit].rlim_cur);
+}
+
+static inline unsigned long task_rlimit_max(const struct task_struct *tsk,
+		unsigned int limit)
+{
+	return ACCESS_ONCE(tsk->signal->rlim[limit].rlim_max);
+}
+
+static inline unsigned long rlimit(unsigned int limit)
+{
+	return task_rlimit(current, limit);
+}
+
+static inline unsigned long rlimit_max(unsigned int limit)
+{
+	return task_rlimit_max(current, limit);
+}
+
 #endif /* __KERNEL__ */
 
 #endif