upgrade to fedora-2.6.12-1.1398.FC4 + vserver 2.0.rc7

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

diff --git a/include/asm-sparc/resource.h b/include/asm-sparc/resource.h
index d4fb2b4..0514c30 100644 (file)
--- a/include/asm-sparc/resource.h
+++ b/include/asm-sparc/resource.h
@@ -8,49 +8,19 @@
 #define _SPARC_RESOURCE_H
 
 /*
- * Resource limits
+ * These two resource limit IDs have a Sparc/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_RSS     5               /* max resident set size */
-#define RLIMIT_NOFILE  6               /* max number of open files */
-#define RLIMIT_NPROC   7               /* max number of processes */
-#define RLIMIT_MEMLOCK 8               /* max locked-in-memory address space */
-#define RLIMIT_AS      9               /* address space limit */
-#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
+#define RLIMIT_NOFILE          6       /* max number of open files */
+#define RLIMIT_NPROC           7       /* max number of processes */
 
 /*
  * SuS says limits have to be unsigned.
  * We make this unsigned, but keep the
- * old value.
+ * old value for compatibility:
  */
-#define RLIM_INFINITY  0x7fffffff
-
-#ifdef __KERNEL__
-#define INIT_RLIMITS                   \
-{                                      \
-    {RLIM_INFINITY, RLIM_INFINITY},    \
-    {RLIM_INFINITY, RLIM_INFINITY},    \
-    {RLIM_INFINITY, RLIM_INFINITY},    \
-    {_STK_LIM, RLIM_INFINITY},         \
-    {       0, RLIM_INFINITY},         \
-    {RLIM_INFINITY, RLIM_INFINITY},    \
-    {INR_OPEN, INR_OPEN}, {0, 0},      \
-    {MLOCK_LIMIT,   MLOCK_LIMIT},      \
-    {RLIM_INFINITY, RLIM_INFINITY},    \
-    {RLIM_INFINITY, RLIM_INFINITY},    \
-    {MAX_SIGPENDING, MAX_SIGPENDING},  \
-    {MQ_BYTES_MAX, MQ_BYTES_MAX},      \
-}
+#define RLIM_INFINITY          0x7fffffff
 
-#endif /* __KERNEL__ */
+#include <asm-generic/resource.h>
 
 #endif /* !(_SPARC_RESOURCE_H) */