vserver 2.0 rc7

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

diff --git a/include/asm-sparc64/resource.h b/include/asm-sparc64/resource.h
index 29d0e13..aa46979 100644 (file)
--- a/include/asm-sparc64/resource.h
+++ b/include/asm-sparc64/resource.h
@@ -8,25 +8,11 @@
 #define _SPARC64_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 __ARCH_RLIMIT_ORDER
+#define RLIMIT_NOFILE          6       /* max number of open files */
+#define RLIMIT_NPROC           7       /* max number of processes */
 
 #include <asm-generic/resource.h>