summaryrefslogtreecommitdiff
path: root/libc/sysdeps/unix/sysv/linux/bits
diff options
context:
space:
mode:
authorjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2011-05-27 16:55:57 +0000
committerjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2011-05-27 16:55:57 +0000
commitdc798c87712902a115d067b099582c811d9f6951 (patch)
tree19acced0b55fa1d27099f69f4808a3ffe83411e7 /libc/sysdeps/unix/sysv/linux/bits
parentf56b42ffd93eb64a1f1aefe7c4f2bd4e2eccafe1 (diff)
downloadeglibc2-dc798c87712902a115d067b099582c811d9f6951.tar.gz
Merge changes between r13953 and r14014 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@14015 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/sysdeps/unix/sysv/linux/bits')
-rw-r--r--libc/sysdeps/unix/sysv/linux/bits/resource.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/libc/sysdeps/unix/sysv/linux/bits/resource.h b/libc/sysdeps/unix/sysv/linux/bits/resource.h
index ca2c9f016..336c19211 100644
--- a/libc/sysdeps/unix/sysv/linux/bits/resource.h
+++ b/libc/sysdeps/unix/sysv/linux/bits/resource.h
@@ -1,5 +1,5 @@
/* Bit values & structures for resource limits. Linux version.
- Copyright (C) 1994, 1996-2000, 2004, 2005, 2008, 2009, 2010
+ Copyright (C) 1994, 1996-2000, 2004, 2005, 2008, 2009, 2010, 2011
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -100,7 +100,13 @@ enum __rlimit_resource
__RLIMIT_RTPRIO = 14,
#define RLIMIT_RTPRIO __RLIMIT_RTPRIO
- __RLIMIT_NLIMITS = 15,
+ /* Maximum CPU time in µs that a process scheduled under a real-time
+ scheduling policy may consume without making a blocking system
+ call before being forcibly descheduled. */
+ __RLIMIT_RTTIME = 15,
+#define RLIMIT_RTTIME __RLIMIT_RTTIME
+
+ __RLIMIT_NLIMITS = 16,
__RLIM_NLIMITS = __RLIMIT_NLIMITS
#define RLIMIT_NLIMITS __RLIMIT_NLIMITS
#define RLIM_NLIMITS __RLIM_NLIMITS