From 79c13d3fab0d5eac5f46d445a5d484da2ded8d21 Mon Sep 17 00:00:00 2001
From: Eugene Teo <eugeneteo@kernel.sg>
Date: Sat, 23 Feb 2008 15:23:52 -0800
Subject: [PATCH] --- yaml --- r: 86228 b: refs/heads/master c:
 8808117ca571fd63e188a2306baae86cca9fce7a h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/fs/proc/base.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 65a05951e512..88b1117e970f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 45254b4fb2aef51c94a7397df1e481c4137b4b97
+refs/heads/master: 8808117ca571fd63e188a2306baae86cca9fce7a
diff --git a/trunk/fs/proc/base.c b/trunk/fs/proc/base.c
index 88f8edf18258..96ee899d6502 100644
--- a/trunk/fs/proc/base.c
+++ b/trunk/fs/proc/base.c
@@ -416,6 +416,7 @@ static const struct limit_names lnames[RLIM_NLIMITS] = {
 	[RLIMIT_MSGQUEUE] = {"Max msgqueue size", "bytes"},
 	[RLIMIT_NICE] = {"Max nice priority", NULL},
 	[RLIMIT_RTPRIO] = {"Max realtime priority", NULL},
+	[RLIMIT_RTTIME] = {"Max realtime timeout", "us"},
 };
 
 /* Display limits for a process */