This commit was manufactured by cvs2svn to create branch 'vserver'.

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

diff --git a/include/asm-alpha/resource.h b/include/asm-alpha/resource.h
index 686b955..c10874f 100644 (file)
--- a/include/asm-alpha/resource.h
+++ b/include/asm-alpha/resource.h
@@ -2,47 +2,21 @@
 #define _ALPHA_RESOURCE_H
 
 /*
- * Resource limits
+ * Alpha/Linux-specific ordering of these four resource limit IDs,
+ * 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_AS      7               /* address space limit(?) */
-#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
+#define RLIMIT_NOFILE          6       /* max number of open files */
+#define RLIMIT_AS              7       /* address space limit */
+#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.  Fine, it's unsigned, but
  * we retain the old value for compatibility, especially with DU. 
  * When you run into the 2^63 barrier, you call me.
  */
-#define RLIM_INFINITY  0x7ffffffffffffffful
-
-#ifdef __KERNEL__
-
-#define INIT_RLIMITS                                                   \
-{                                                                      \
-    {LONG_MAX, LONG_MAX},                      /* RLIMIT_CPU */        \
-    {LONG_MAX, LONG_MAX},                      /* RLIMIT_FSIZE */      \
-    {LONG_MAX, LONG_MAX},                      /* RLIMIT_DATA */       \
-    {_STK_LIM, LONG_MAX},                      /* RLIMIT_STACK */      \
-    {       0, LONG_MAX},                      /* RLIMIT_CORE */       \
-    {LONG_MAX, LONG_MAX},                      /* RLIMIT_RSS */        \
-    {INR_OPEN, INR_OPEN},                      /* RLIMIT_NOFILE */     \
-    {LONG_MAX, LONG_MAX},                      /* RLIMIT_AS */         \
-    {LONG_MAX, LONG_MAX},                      /* RLIMIT_NPROC */      \
-    {LONG_MAX, LONG_MAX},                      /* RLIMIT_MEMLOCK */    \
-    {LONG_MAX, LONG_MAX},                       /* RLIMIT_LOCKS */      \
-}
+#define RLIM_INFINITY          0x7ffffffffffffffful
 
-#endif /* __KERNEL__ */
+#include <asm-generic/resource.h>
 
 #endif /* _ALPHA_RESOURCE_H */