diff options
| author | Lachlan McIlroy <[email protected]> | 2008-02-26 03:26:14 +0000 |
|---|---|---|
| committer | Lachlan McIlroy <[email protected]> | 2008-02-26 03:26:14 +0000 |
| commit | 91e229bbad6524aabaac8717b2f559283670c37a (patch) | |
| tree | 84a55e4ac2dcf23add97bd9fde3e9cb232c12b30 /fs/proc/base.c | |
| parent | Remove empty file fs/xfs/Makefile-linux-2.6. (diff) | |
| parent | Linux 2.6.25-rc3 (diff) | |
| download | kernel-91e229bbad6524aabaac8717b2f559283670c37a.tar.gz kernel-91e229bbad6524aabaac8717b2f559283670c37a.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'fs/proc/base.c')
| -rw-r--r-- | fs/proc/base.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c index 88f8edf18258..96ee899d6502 100644 --- a/fs/proc/base.c +++ b/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 */ |