patch-2.1.16 linux/include/asm-ppc/resource.h

Next file: linux/include/asm-ppc/segment.h
Previous file: linux/include/asm-ppc/residual.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.15/linux/include/asm-ppc/resource.h linux/include/asm-ppc/resource.h
@@ -1,35 +1,33 @@
 #ifndef _PPC_RESOURCE_H
 #define _PPC_RESOURCE_H
 
-/*
- * Resource limits
- */
-
 #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_NPROC	6		/* max number of processes */
-#define RLIMIT_NOFILE	7		/* max number of open files */
-#define RLIMIT_MEMLOCK	8		/* max locked-in-memory address space */
+#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 RLIM_NLIMITS	9
+#define RLIM_NLIMITS	10
 
 #ifdef __KERNEL__
 
-#define INIT_RLIMITS					\
-{							\
-	{ LONG_MAX, LONG_MAX },				\
-	{ LONG_MAX, LONG_MAX },				\
-	{ LONG_MAX, LONG_MAX },				\
-	{ _STK_LIM, _STK_LIM },				\
-	{        0, LONG_MAX },				\
-	{ LONG_MAX, LONG_MAX },				\
-	{ MAX_TASKS_PER_USER, MAX_TASKS_PER_USER },	\
-	{ NR_OPEN, NR_OPEN },				\
-	{ LONG_MAX, LONG_MAX },				\
+#define INIT_RLIMITS							\
+{									\
+    {LONG_MAX, LONG_MAX},			/* RLIMIT_CPU */	\
+    {LONG_MAX, LONG_MAX},			/* RLIMIT_FSIZE */	\
+    {LONG_MAX, LONG_MAX},			/* RLIMIT_DATA */	\
+    {_STK_LIM, _STK_LIM},			/* RLIMIT_STACK */	\
+    {       0, LONG_MAX},			/* RLIMIT_CORE */	\
+    {LONG_MAX, LONG_MAX},			/* RLIMIT_RSS */	\
+    { NR_OPEN,  NR_OPEN},			/* RLIMIT_NOFILE */	\
+    {LONG_MAX, LONG_MAX},			/* RLIMIT_AS */		\
+    {MAX_TASKS_PER_USER, MAX_TASKS_PER_USER},	/* RLIMIT_NPROC */	\
+    {LONG_MAX, LONG_MAX},			/* RLIMIT_MEMLOCK */	\
 }
 
 #endif /* __KERNEL__ */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov