Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

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

diff --git a/include/asm-mips/resource.h b/include/asm-mips/resource.h
index 4beb215..87cb308 100644 (file)
--- a/include/asm-mips/resource.h
+++ b/include/asm-mips/resource.h
@@ -9,53 +9,27 @@
 #ifndef _ASM_RESOURCE_H
 #define _ASM_RESOURCE_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 RLIM_NLIMITS 11                        /* Number of limit flavors.  */
-
-#ifdef __KERNEL__
-
-#include <linux/config.h>
+#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:
  */
-#ifdef CONFIG_MIPS32
-#define RLIM_INFINITY  0x7fffffffUL
-#endif
-#ifdef CONFIG_MIPS64
-#define RLIM_INFINITY  (~0UL)
+#ifdef CONFIG_32BIT
+# define RLIM_INFINITY         0x7fffffffUL
 #endif
 
-#define INIT_RLIMITS                                   \
-{                                                      \
-       { RLIM_INFINITY, RLIM_INFINITY },               \
-       { RLIM_INFINITY, RLIM_INFINITY },               \
-       { RLIM_INFINITY, RLIM_INFINITY },               \
-       { _STK_LIM,      RLIM_INFINITY },               \
-       {        0,      RLIM_INFINITY },               \
-       { INR_OPEN,      INR_OPEN      },               \
-       { RLIM_INFINITY, RLIM_INFINITY },               \
-       { RLIM_INFINITY, RLIM_INFINITY },               \
-       { 0,             0             },               \
-       { RLIM_INFINITY, RLIM_INFINITY },               \
-       { RLIM_INFINITY, RLIM_INFINITY },               \
-}
-
-#endif /* __KERNEL__ */
+#include <asm-generic/resource.h>
 
 #endif /* _ASM_RESOURCE_H */