vserver 2.0 rc7

[linux-2.6.git] / include / asm-mips / resource.h

diff --git a/include/asm-mips/resource.h b/include/asm-mips/resource.h
index 9732bb4..fd3c6d1 100644 (file)
--- a/include/asm-mips/resource.h
+++ b/include/asm-mips/resource.h
@@ -9,36 +9,26 @@
 #ifndef _ASM_RESOURCE_H
 #define _ASM_RESOURCE_H
 
+#include <linux/config.h>
+
 /*
- * Resource limits
+ * These five resource limit IDs have a MIPS/Linux-specific ordering,
+ * the rest comes from the generic header:
  */
-#define RLIMIT_CPU 0                   /* CPU time in ms */
-#define RLIMIT_FSIZE 1                 /* Maximum filesize */
-#define RLIMIT_DATA 2                  /* max data size */
-#define RLIMIT_STACK 3                 /* max stack size */
-#define RLIMIT_CORE 4                  /* max core file size */
-#define RLIMIT_NOFILE 5                        /* max number of open files */
-#define RLIMIT_AS 6                    /* mapped memory */
-#define RLIMIT_RSS 7                   /* max resident set size */
-#define RLIMIT_NPROC 8                 /* max number of processes */
-#define RLIMIT_MEMLOCK 9               /* max locked-in-memory address space */
-#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 RLIM_NLIMITS 13                        /* Number of limit flavors.  */
-#define __ARCH_RLIMIT_ORDER
+#define RLIMIT_NOFILE          5       /* max number of open files */
+#define RLIMIT_AS              6       /* address space limit */
+#define RLIMIT_RSS             7       /* max resident set size */
+#define RLIMIT_NPROC           8       /* max number of processes */
+#define RLIMIT_MEMLOCK         9       /* max locked-in-memory address space */
 
 /*
  * SuS says limits have to be unsigned.
- * Which makes a ton more sense anyway.
+ * Which makes a ton more sense anyway,
+ * but we keep the old value on MIPS32,
+ * for compatibility:
  */
-#include <linux/config.h>
 #ifdef CONFIG_MIPS32
-#define RLIM_INFINITY  0x7fffffffUL
-#endif
-#ifdef CONFIG_MIPS64
-#define RLIM_INFINITY  (~0UL)
+# define RLIM_INFINITY         0x7fffffffUL
 #endif
 
 #include <asm-generic/resource.h>