Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched

[linux-2.6] / include / asm-generic / resource.h

diff --git a/include/asm-generic/resource.h b/include/asm-generic/resource.h
index b1fcda9eac23d3b21ffe19135c6f4d529b4989bc..a4a22cc358987c86999ef602301b2ca189526dfe 100644 (file)
--- a/include/asm-generic/resource.h
+++ b/include/asm-generic/resource.h
@@ -12,7 +12,7 @@
  *   then it defines them prior including asm-generic/resource.h. )
  */
 
-#define RLIMIT_CPU             0       /* CPU time in ms */
+#define RLIMIT_CPU             0       /* CPU time in sec */
 #define RLIMIT_FSIZE           1       /* Maximum filesize */
 #define RLIMIT_DATA            2       /* max data size */
 #define RLIMIT_STACK           3       /* max stack size */
@@ -41,8 +41,11 @@
 #define RLIMIT_LOCKS           10      /* maximum file locks held */
 #define RLIMIT_SIGPENDING      11      /* max number of pending signals */
 #define RLIMIT_MSGQUEUE                12      /* maximum bytes in POSIX mqueues */
+#define RLIMIT_NICE            13      /* max nice prio allowed to raise to
+                                          0-39 for nice level 19 .. -20 */
+#define RLIMIT_RTPRIO          14      /* maximum realtime priority */
 
-#define RLIM_NLIMITS           13
+#define RLIM_NLIMITS           15
 
 /*
  * SuS says limits have to be unsigned.
@@ -81,6 +84,8 @@
        [RLIMIT_LOCKS]          = {  RLIM_INFINITY,  RLIM_INFINITY },   \
        [RLIMIT_SIGPENDING]     = {             0,             0 },     \
        [RLIMIT_MSGQUEUE]       = {   MQ_BYTES_MAX,   MQ_BYTES_MAX },   \
+       [RLIMIT_NICE]           = { 0, 0 },                             \
+       [RLIMIT_RTPRIO]         = { 0, 0 },                             \
 }
 
 #endif /* __KERNEL__ */