From: Chris Wright Most of the include/asm-*/resource.h headers are the same as one another. This patch makes one generic version, include/asm-generic/resource.h, and uses that when appropriate. The only vaguely interesting things here are that the generic version introduces a new _STK_LIM_MAX macro, which can be populated by an arch (ia64 and parisc needed that). Also, some arches hid RLIM_INFINITY under __KERNEL__, while others did not. The generic version does not, so the following arches will see that change: arm, arm26, mips, ppc, ppc64, sh (and hence sh64) And, finally, some arches maintain their own order for the resource numbers. This is now marked by __ARCH_RLIMIT_ORDER, and is used by the following arches: alpha, mips, sparc, and sparc64. This actually uncovered a mips bug (fix already sent, this patch is relative to that fix), where the default RLIMIT_MEMLOCK was set to RLIM_INFINITY and RLIMIT_NPROC set to MLOCK_LIMIT (the latter is no big deal because RLIMIT_NPROC default is overwritten dynamically during bootup in fork_init()). Also, this change makes alpha's default for RLIMIT_NPROC change from RLIM_INFINITY to 0, but again...no problem as it's dynamically overwritten during bootup. The following arches are left untouched: m68knommu: untouched (uses m68k/resource.h) sh64: untouched (uses asm-sh/resource.h) um: untouched (uses arch code already) Signed-off-by: Chris Wright Signed-off-by: Andrew Morton --- 25-akpm/include/asm-alpha/resource.h | 22 +----------- 25-akpm/include/asm-arm/resource.h | 47 ------------------------- 25-akpm/include/asm-arm26/resource.h | 47 ------------------------- 25-akpm/include/asm-cris/resource.h | 47 ------------------------- 25-akpm/include/asm-frv/resource.h | 48 -------------------------- 25-akpm/include/asm-generic/resource.h | 60 +++++++++++++++++++++++++++++++++ 25-akpm/include/asm-h8300/resource.h | 47 ------------------------- 25-akpm/include/asm-i386/resource.h | 48 -------------------------- 25-akpm/include/asm-ia64/resource.h | 54 +---------------------------- 25-akpm/include/asm-m32r/resource.h | 51 ---------------------------- 25-akpm/include/asm-m68k/resource.h | 47 ------------------------- 25-akpm/include/asm-mips/resource.h | 25 +------------ 25-akpm/include/asm-parisc/resource.h | 48 +------------------------- 25-akpm/include/asm-ppc/resource.h | 44 ------------------------ 25-akpm/include/asm-ppc64/resource.h | 53 ----------------------------- 25-akpm/include/asm-s390/resource.h | 47 ------------------------- 25-akpm/include/asm-sh/resource.h | 47 ------------------------- 25-akpm/include/asm-sparc/resource.h | 20 +---------- 25-akpm/include/asm-sparc64/resource.h | 26 +------------- 25-akpm/include/asm-v850/resource.h | 47 ------------------------- 25-akpm/include/asm-x86_64/resource.h | 47 ------------------------- 21 files changed, 87 insertions(+), 835 deletions(-) diff -puN include/asm-alpha/resource.h~consolidate-arch-specific-resourceh-headers include/asm-alpha/resource.h --- 25/include/asm-alpha/resource.h~consolidate-arch-specific-resourceh-headers 2005-01-19 18:11:31.208875816 -0800 +++ 25-akpm/include/asm-alpha/resource.h 2005-01-19 18:11:31.238871256 -0800 @@ -20,6 +20,7 @@ #define RLIMIT_MSGQUEUE 12 /* maximum bytes in POSIX mqueues */ #define RLIM_NLIMITS 13 +#define __ARCH_RLIMIT_ORDER /* * SuS says limits have to be unsigned. Fine, it's unsigned, but @@ -28,25 +29,6 @@ */ #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 */ \ - {MLOCK_LIMIT, MLOCK_LIMIT }, /* RLIMIT_MEMLOCK */ \ - {LONG_MAX, LONG_MAX}, /* RLIMIT_LOCKS */ \ - {MAX_SIGPENDING, MAX_SIGPENDING}, /* RLIMIT_SIGPENDING */ \ - {MQ_BYTES_MAX, MQ_BYTES_MAX}, /* RLIMIT_MSGQUEUE */ \ -} - -#endif /* __KERNEL__ */ +#include #endif /* _ALPHA_RESOURCE_H */ diff -puN include/asm-arm26/resource.h~consolidate-arch-specific-resourceh-headers include/asm-arm26/resource.h --- 25/include/asm-arm26/resource.h~consolidate-arch-specific-resourceh-headers 2005-01-19 18:11:31.210875512 -0800 +++ 25-akpm/include/asm-arm26/resource.h 2005-01-19 18:11:31.239871104 -0800 @@ -1,51 +1,6 @@ #ifndef _ARM_RESOURCE_H #define _ARM_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_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 - -#ifdef __KERNEL__ - -/* - * SuS says limits have to be unsigned. - * Which makes a ton more sense anyway. - */ -#define RLIM_INFINITY (~0UL) - -#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 }, \ - { 0, 0 }, \ - { INR_OPEN, INR_OPEN }, \ - { MLOCK_LIMIT, MLOCK_LIMIT }, \ - { RLIM_INFINITY, RLIM_INFINITY }, \ - { RLIM_INFINITY, RLIM_INFINITY }, \ - { MAX_SIGPENDING, MAX_SIGPENDING}, \ - { MQ_BYTES_MAX, MQ_BYTES_MAX}, \ -} - -#endif /* __KERNEL__ */ +#include #endif diff -puN include/asm-arm/resource.h~consolidate-arch-specific-resourceh-headers include/asm-arm/resource.h --- 25/include/asm-arm/resource.h~consolidate-arch-specific-resourceh-headers 2005-01-19 18:11:31.211875360 -0800 +++ 25-akpm/include/asm-arm/resource.h 2005-01-19 18:11:31.238871256 -0800 @@ -1,51 +1,6 @@ #ifndef _ARM_RESOURCE_H #define _ARM_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_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 - -#ifdef __KERNEL__ - -/* - * SuS says limits have to be unsigned. - * Which makes a ton more sense anyway. - */ -#define RLIM_INFINITY (~0UL) - -#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 }, \ - { 0, 0 }, \ - { INR_OPEN, INR_OPEN }, \ - { MLOCK_LIMIT, MLOCK_LIMIT }, \ - { RLIM_INFINITY, RLIM_INFINITY }, \ - { RLIM_INFINITY, RLIM_INFINITY }, \ - { MAX_SIGPENDING, MAX_SIGPENDING}, \ - { MQ_BYTES_MAX, MQ_BYTES_MAX}, \ -} - -#endif /* __KERNEL__ */ +#include #endif diff -puN include/asm-cris/resource.h~consolidate-arch-specific-resourceh-headers include/asm-cris/resource.h --- 25/include/asm-cris/resource.h~consolidate-arch-specific-resourceh-headers 2005-01-19 18:11:31.212875208 -0800 +++ 25-akpm/include/asm-cris/resource.h 2005-01-19 18:11:31.239871104 -0800 @@ -1,51 +1,6 @@ #ifndef _CRIS_RESOURCE_H #define _CRIS_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_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 - -/* - * SuS says limits have to be unsigned. - * Which makes a ton more sense anyway. - */ -#define RLIM_INFINITY (~0UL) - -#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 }, \ - { 0, 0 }, \ - { INR_OPEN, INR_OPEN }, \ - { MLOCK_LIMIT, MLOCK_LIMIT }, \ - { RLIM_INFINITY, RLIM_INFINITY }, \ - { RLIM_INFINITY, RLIM_INFINITY }, \ - { MAX_SIGPENDING, MAX_SIGPENDING }, \ - { MQ_BYTES_MAX, MQ_BYTES_MAX }, \ -} - -#endif /* __KERNEL__ */ +#include #endif diff -puN include/asm-frv/resource.h~consolidate-arch-specific-resourceh-headers include/asm-frv/resource.h --- 25/include/asm-frv/resource.h~consolidate-arch-specific-resourceh-headers 2005-01-19 18:11:31.213875056 -0800 +++ 25-akpm/include/asm-frv/resource.h 2005-01-19 18:11:31.240870952 -0800 @@ -1,53 +1,7 @@ #ifndef _ASM_RESOURCE_H #define _ASM_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_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 - - -/* - * SuS says limits have to be unsigned. - * Which makes a ton more sense anyway. - */ -#define RLIM_INFINITY (~0UL) - -#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 }, \ - { 0, 0 }, \ - { INR_OPEN, INR_OPEN }, \ - { MLOCK_LIMIT, MLOCK_LIMIT }, \ - { RLIM_INFINITY, RLIM_INFINITY }, \ - { RLIM_INFINITY, RLIM_INFINITY }, \ - { MAX_SIGPENDING, MAX_SIGPENDING }, \ - { MQ_BYTES_MAX, MQ_BYTES_MAX }, \ -} - -#endif /* __KERNEL__ */ +#include #endif /* _ASM_RESOURCE_H */ diff -puN /dev/null include/asm-generic/resource.h --- /dev/null 2003-09-15 06:40:47.000000000 -0700 +++ 25-akpm/include/asm-generic/resource.h 2005-01-19 18:11:31.237871408 -0800 @@ -0,0 +1,60 @@ +#ifndef _ASM_GENERIC_RESOURCE_H +#define _ASM_GENERIC_RESOURCE_H + +/* + * Resource limits + */ + +/* Allow arch to control resource order */ +#ifndef __ARCH_RLIMIT_ORDER +#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_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 +#endif + +/* + * SuS says limits have to be unsigned. + * Which makes a ton more sense anyway. + */ +#ifndef RLIM_INFINITY +#define RLIM_INFINITY (~0UL) +#endif + +#ifndef _STK_LIM_MAX +#define _STK_LIM_MAX RLIM_INFINITY +#endif + +#ifdef __KERNEL__ + +#define INIT_RLIMITS \ +{ \ + [RLIMIT_CPU] = { RLIM_INFINITY, RLIM_INFINITY }, \ + [RLIMIT_FSIZE] = { RLIM_INFINITY, RLIM_INFINITY }, \ + [RLIMIT_DATA] = { RLIM_INFINITY, RLIM_INFINITY }, \ + [RLIMIT_STACK] = { _STK_LIM, _STK_LIM_MAX }, \ + [RLIMIT_CORE] = { 0, RLIM_INFINITY }, \ + [RLIMIT_RSS] = { RLIM_INFINITY, RLIM_INFINITY }, \ + [RLIMIT_NPROC] = { 0, 0 }, \ + [RLIMIT_NOFILE] = { INR_OPEN, INR_OPEN }, \ + [RLIMIT_MEMLOCK] = { MLOCK_LIMIT, MLOCK_LIMIT }, \ + [RLIMIT_AS] = { RLIM_INFINITY, RLIM_INFINITY }, \ + [RLIMIT_LOCKS] = { RLIM_INFINITY, RLIM_INFINITY }, \ + [RLIMIT_SIGPENDING] = { MAX_SIGPENDING, MAX_SIGPENDING }, \ + [RLIMIT_MSGQUEUE] = { MQ_BYTES_MAX, MQ_BYTES_MAX }, \ +} + +#endif /* __KERNEL__ */ + +#endif diff -puN include/asm-h8300/resource.h~consolidate-arch-specific-resourceh-headers include/asm-h8300/resource.h --- 25/include/asm-h8300/resource.h~consolidate-arch-specific-resourceh-headers 2005-01-19 18:11:31.215874752 -0800 +++ 25-akpm/include/asm-h8300/resource.h 2005-01-19 18:11:31.240870952 -0800 @@ -1,51 +1,6 @@ #ifndef _H8300_RESOURCE_H #define _H8300_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_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 - -/* - * SuS says limits have to be unsigned. - * Which makes a ton more sense anyway. - */ -#define RLIM_INFINITY (~0UL) - -#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 }, \ - { 0, 0 }, \ - { INR_OPEN, INR_OPEN }, \ - { MLOCK_LIMIT, MLOCK_LIMIT }, \ - { RLIM_INFINITY, RLIM_INFINITY }, \ - { RLIM_INFINITY, RLIM_INFINITY }, \ - { MAX_SIGPENDING, MAX_SIGPENDING }, \ - { MQ_BYTES_MAX, MQ_BYTES_MAX }, \ -} - -#endif /* __KERNEL__ */ +#include #endif /* _H8300_RESOURCE_H */ diff -puN include/asm-i386/resource.h~consolidate-arch-specific-resourceh-headers include/asm-i386/resource.h --- 25/include/asm-i386/resource.h~consolidate-arch-specific-resourceh-headers 2005-01-19 18:11:31.216874600 -0800 +++ 25-akpm/include/asm-i386/resource.h 2005-01-19 18:11:31.241870800 -0800 @@ -1,52 +1,6 @@ #ifndef _I386_RESOURCE_H #define _I386_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_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 - - -/* - * SuS says limits have to be unsigned. - * Which makes a ton more sense anyway. - */ -#define RLIM_INFINITY (~0UL) - -#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 }, \ - { 0, 0 }, \ - { INR_OPEN, INR_OPEN }, \ - { MLOCK_LIMIT, MLOCK_LIMIT }, \ - { RLIM_INFINITY, RLIM_INFINITY }, \ - { RLIM_INFINITY, RLIM_INFINITY }, \ - { MAX_SIGPENDING, MAX_SIGPENDING }, \ - { MQ_BYTES_MAX, MQ_BYTES_MAX }, \ -} - -#endif /* __KERNEL__ */ +#include #endif diff -puN include/asm-ia64/resource.h~consolidate-arch-specific-resourceh-headers include/asm-ia64/resource.h --- 25/include/asm-ia64/resource.h~consolidate-arch-specific-resourceh-headers 2005-01-19 18:11:31.218874296 -0800 +++ 25-akpm/include/asm-ia64/resource.h 2005-01-19 18:11:31.241870800 -0800 @@ -1,58 +1,8 @@ #ifndef _ASM_IA64_RESOURCE_H #define _ASM_IA64_RESOURCE_H -/* - * Resource limits - * - * Based on . - * - * Modified 1998, 1999 - * David Mosberger-Tang , Hewlett-Packard Co - */ - #include - -#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_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 - -/* - * SuS says limits have to be unsigned. - * Which makes a ton more sense anyway. - */ -#define RLIM_INFINITY (~0UL) - -# ifdef __KERNEL__ - -#define INIT_RLIMITS \ -{ \ - { RLIM_INFINITY, RLIM_INFINITY }, \ - { RLIM_INFINITY, RLIM_INFINITY }, \ - { RLIM_INFINITY, RLIM_INFINITY }, \ - { _STK_LIM, DEFAULT_USER_STACK_SIZE }, \ - { 0, RLIM_INFINITY }, \ - { RLIM_INFINITY, RLIM_INFINITY }, \ - { 0, 0 }, \ - { INR_OPEN, INR_OPEN }, \ - { MLOCK_LIMIT, MLOCK_LIMIT }, \ - { RLIM_INFINITY, RLIM_INFINITY }, \ - { RLIM_INFINITY, RLIM_INFINITY }, \ - { MAX_SIGPENDING, MAX_SIGPENDING }, \ - { MQ_BYTES_MAX, MQ_BYTES_MAX }, \ -} - -# endif /* __KERNEL__ */ +#define _STK_LIM_MAX DEFAULT_USER_STACK_SIZE +#include #endif /* _ASM_IA64_RESOURCE_H */ diff -puN include/asm-m32r/resource.h~consolidate-arch-specific-resourceh-headers include/asm-m32r/resource.h --- 25/include/asm-m32r/resource.h~consolidate-arch-specific-resourceh-headers 2005-01-19 18:11:31.219874144 -0800 +++ 25-akpm/include/asm-m32r/resource.h 2005-01-19 18:11:31.242870648 -0800 @@ -1,55 +1,6 @@ #ifndef _ASM_M32R_RESOURCE_H #define _ASM_M32R_RESOURCE_H -/* $Id$ */ - -/* orig : i386 2.4.18 */ - -/* - * 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_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 - -/* - * SuS says limits have to be unsigned. - * Which makes a ton more sense anyway. - */ -#define RLIM_INFINITY (~0UL) - -#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 }, \ - { 0, 0 }, \ - { INR_OPEN, INR_OPEN }, \ - { MLOCK_LIMIT, MLOCK_LIMIT }, \ - { RLIM_INFINITY, RLIM_INFINITY }, \ - { RLIM_INFINITY, RLIM_INFINITY }, \ - { MAX_SIGPENDING, MAX_SIGPENDING }, \ - { MQ_BYTES_MAX, MQ_BYTES_MAX }, \ -} - -#endif /* __KERNEL__ */ +#include #endif /* _ASM_M32R_RESOURCE_H */ diff -puN include/asm-m68k/resource.h~consolidate-arch-specific-resourceh-headers include/asm-m68k/resource.h --- 25/include/asm-m68k/resource.h~consolidate-arch-specific-resourceh-headers 2005-01-19 18:11:31.220873992 -0800 +++ 25-akpm/include/asm-m68k/resource.h 2005-01-19 18:11:31.242870648 -0800 @@ -1,51 +1,6 @@ #ifndef _M68K_RESOURCE_H #define _M68K_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_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 - -/* - * SuS says limits have to be unsigned. - * Which makes a ton more sense anyway. - */ -#define RLIM_INFINITY (~0UL) - -#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 }, \ - { 0, 0 }, \ - { INR_OPEN, INR_OPEN }, \ - { MLOCK_LIMIT, MLOCK_LIMIT }, \ - { RLIM_INFINITY, RLIM_INFINITY }, \ - { RLIM_INFINITY, RLIM_INFINITY }, \ - { MAX_SIGPENDING, MAX_SIGPENDING }, \ - { MQ_BYTES_MAX, MQ_BYTES_MAX }, \ -} - -#endif /* __KERNEL__ */ +#include #endif /* _M68K_RESOURCE_H */ diff -puN include/asm-mips/resource.h~consolidate-arch-specific-resourceh-headers include/asm-mips/resource.h --- 25/include/asm-mips/resource.h~consolidate-arch-specific-resourceh-headers 2005-01-19 18:11:31.221873840 -0800 +++ 25-akpm/include/asm-mips/resource.h 2005-01-19 18:11:31.243870496 -0800 @@ -27,15 +27,13 @@ #define RLIMIT_MSGQUEUE 12 /* maximum bytes in POSIX mqueues */ #define RLIM_NLIMITS 13 /* Number of limit flavors. */ - -#ifdef __KERNEL__ - -#include +#define __ARCH_RLIMIT_ORDER /* * SuS says limits have to be unsigned. * Which makes a ton more sense anyway. */ +#include #ifdef CONFIG_MIPS32 #define RLIM_INFINITY 0x7fffffffUL #endif @@ -43,23 +41,6 @@ #define RLIM_INFINITY (~0UL) #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 }, \ - { MLOCK_LIMIT, MLOCK_LIMIT }, \ - { RLIM_INFINITY, RLIM_INFINITY }, \ - { MAX_SIGPENDING, MAX_SIGPENDING }, \ - { MQ_BYTES_MAX, MQ_BYTES_MAX }, \ -} - -#endif /* __KERNEL__ */ +#include #endif /* _ASM_RESOURCE_H */ diff -puN include/asm-parisc/resource.h~consolidate-arch-specific-resourceh-headers include/asm-parisc/resource.h --- 25/include/asm-parisc/resource.h~consolidate-arch-specific-resourceh-headers 2005-01-19 18:11:31.223873536 -0800 +++ 25-akpm/include/asm-parisc/resource.h 2005-01-19 18:11:31.243870496 -0800 @@ -1,51 +1,7 @@ #ifndef _ASM_PARISC_RESOURCE_H #define _ASM_PARISC_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_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 - -/* - * SuS says limits have to be unsigned. - * Which makes a ton more sense anyway. - */ -#define RLIM_INFINITY (~0UL) - -#ifdef __KERNEL__ - -#define INIT_RLIMITS \ -{ \ - { RLIM_INFINITY, RLIM_INFINITY }, \ - { RLIM_INFINITY, RLIM_INFINITY }, \ - { RLIM_INFINITY, RLIM_INFINITY }, \ - { _STK_LIM, 10 * _STK_LIM }, \ - { 0, RLIM_INFINITY }, \ - { RLIM_INFINITY, RLIM_INFINITY }, \ - { 0, 0 }, \ - { INR_OPEN, INR_OPEN }, \ - { MLOCK_LIMIT, MLOCK_LIMIT }, \ - { RLIM_INFINITY, RLIM_INFINITY }, \ - { RLIM_INFINITY, RLIM_INFINITY }, \ - { MAX_SIGPENDING, MAX_SIGPENDING }, \ - { MQ_BYTES_MAX, MQ_BYTES_MAX }, \ -} - -#endif /* __KERNEL__ */ +#define _STK_LIM_MAX 10 * _STK_LIM +#include #endif diff -puN include/asm-ppc64/resource.h~consolidate-arch-specific-resourceh-headers include/asm-ppc64/resource.h --- 25/include/asm-ppc64/resource.h~consolidate-arch-specific-resourceh-headers 2005-01-19 18:11:31.224873384 -0800 +++ 25-akpm/include/asm-ppc64/resource.h 2005-01-19 18:11:31.244870344 -0800 @@ -1,57 +1,6 @@ #ifndef _PPC64_RESOURCE_H #define _PPC64_RESOURCE_H -/* - * Copyright (C) 2001 PPC 64 Team, IBM Corp - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version - * 2 of the License, or (at your option) any later version. - */ - -#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_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 - -#ifdef __KERNEL__ - -/* - * SuS says limits have to be unsigned. - * Which makes a ton more sense anyway. - */ -#define RLIM_INFINITY (~0UL) - - -#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 }, \ - { 0, 0 }, \ - { INR_OPEN, INR_OPEN }, \ - { MLOCK_LIMIT, MLOCK_LIMIT }, \ - { RLIM_INFINITY, RLIM_INFINITY }, \ - { RLIM_INFINITY, RLIM_INFINITY }, \ - { MAX_SIGPENDING, MAX_SIGPENDING }, \ - { MQ_BYTES_MAX, MQ_BYTES_MAX }, \ -} - -#endif /* __KERNEL__ */ +#include #endif /* _PPC64_RESOURCE_H */ diff -puN include/asm-ppc/resource.h~consolidate-arch-specific-resourceh-headers include/asm-ppc/resource.h --- 25/include/asm-ppc/resource.h~consolidate-arch-specific-resourceh-headers 2005-01-19 18:11:31.225873232 -0800 +++ 25-akpm/include/asm-ppc/resource.h 2005-01-19 18:11:31.243870496 -0800 @@ -1,48 +1,6 @@ #ifndef _PPC_RESOURCE_H #define _PPC_RESOURCE_H -#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_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 - -#ifdef __KERNEL__ - -/* - * SuS says limits have to be unsigned. - * Which makes a ton more sense anyway. - */ -#define RLIM_INFINITY (~0UL) - - -#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 }, \ - { 0, 0 }, \ - { INR_OPEN, INR_OPEN }, \ - { MLOCK_LIMIT, MLOCK_LIMIT }, \ - { RLIM_INFINITY, RLIM_INFINITY }, \ - { RLIM_INFINITY, RLIM_INFINITY }, \ - { MAX_SIGPENDING, MAX_SIGPENDING }, \ - { MQ_BYTES_MAX, MQ_BYTES_MAX }, \ -} - -#endif /* __KERNEL__ */ +#include #endif diff -puN include/asm-s390/resource.h~consolidate-arch-specific-resourceh-headers include/asm-s390/resource.h --- 25/include/asm-s390/resource.h~consolidate-arch-specific-resourceh-headers 2005-01-19 18:11:31.227872928 -0800 +++ 25-akpm/include/asm-s390/resource.h 2005-01-19 18:11:31.244870344 -0800 @@ -9,52 +9,7 @@ #ifndef _S390_RESOURCE_H #define _S390_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_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 - -/* - * SuS says limits have to be unsigned. - * Which makes a ton more sense anyway. - */ -#define RLIM_INFINITY (~0UL) - -#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 }, \ - { 0, 0 }, \ - { INR_OPEN, INR_OPEN }, \ - { MLOCK_LIMIT, MLOCK_LIMIT }, \ - { RLIM_INFINITY, RLIM_INFINITY }, \ - { RLIM_INFINITY, RLIM_INFINITY }, \ - { MAX_SIGPENDING, MAX_SIGPENDING }, \ - { MQ_BYTES_MAX, MQ_BYTES_MAX }, \ -} - -#endif /* __KERNEL__ */ +#include #endif diff -puN include/asm-sh/resource.h~consolidate-arch-specific-resourceh-headers include/asm-sh/resource.h --- 25/include/asm-sh/resource.h~consolidate-arch-specific-resourceh-headers 2005-01-19 18:11:31.228872776 -0800 +++ 25-akpm/include/asm-sh/resource.h 2005-01-19 18:11:31.245870192 -0800 @@ -1,51 +1,6 @@ #ifndef __ASM_SH_RESOURCE_H #define __ASM_SH_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_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 - -#ifdef __KERNEL__ - -/* - * SuS says limits have to be unsigned. - * Which makes a ton more sense anyway. - */ -#define RLIM_INFINITY (~0UL) - -#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 }, \ - { 0, 0 }, \ - { INR_OPEN, INR_OPEN }, \ - { MLOCK_LIMIT, MLOCK_LIMIT }, \ - { RLIM_INFINITY, RLIM_INFINITY }, \ - { RLIM_INFINITY, RLIM_INFINITY }, \ - { MAX_SIGPENDING, MAX_SIGPENDING }, \ - { MQ_BYTES_MAX, MQ_BYTES_MAX }, \ -} - -#endif /* __KERNEL__ */ +#include #endif /* __ASM_SH_RESOURCE_H */ diff -puN include/asm-sparc64/resource.h~consolidate-arch-specific-resourceh-headers include/asm-sparc64/resource.h --- 25/include/asm-sparc64/resource.h~consolidate-arch-specific-resourceh-headers 2005-01-19 18:11:31.229872624 -0800 +++ 25-akpm/include/asm-sparc64/resource.h 2005-01-19 18:11:31.246870040 -0800 @@ -26,30 +26,8 @@ #define RLIMIT_MSGQUEUE 12 /* maximum bytes in POSIX mqueues */ #define RLIM_NLIMITS 13 +#define __ARCH_RLIMIT_ORDER -/* - * SuS says limits have to be unsigned. - * Which makes a ton more sense anyway. - */ -#define RLIM_INFINITY (~0UL) - -#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}, \ -} - -#endif /* __KERNEL__ */ +#include #endif /* !(_SPARC64_RESOURCE_H) */ diff -puN include/asm-sparc/resource.h~consolidate-arch-specific-resourceh-headers include/asm-sparc/resource.h --- 25/include/asm-sparc/resource.h~consolidate-arch-specific-resourceh-headers 2005-01-19 18:11:31.231872320 -0800 +++ 25-akpm/include/asm-sparc/resource.h 2005-01-19 18:11:31.245870192 -0800 @@ -26,6 +26,7 @@ #define RLIMIT_MSGQUEUE 12 /* maximum bytes in POSIX mqueues */ #define RLIM_NLIMITS 13 +#define __ARCH_RLIMIT_ORDER /* * SuS says limits have to be unsigned. @@ -34,23 +35,6 @@ */ #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}, \ -} - -#endif /* __KERNEL__ */ +#include #endif /* !(_SPARC_RESOURCE_H) */ diff -puN include/asm-v850/resource.h~consolidate-arch-specific-resourceh-headers include/asm-v850/resource.h --- 25/include/asm-v850/resource.h~consolidate-arch-specific-resourceh-headers 2005-01-19 18:11:31.232872168 -0800 +++ 25-akpm/include/asm-v850/resource.h 2005-01-19 18:11:31.246870040 -0800 @@ -1,51 +1,6 @@ #ifndef __V850_RESOURCE_H__ #define __V850_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_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 - -/* - * SuS says limits have to be unsigned. - * Which makes a ton more sense anyway. - */ -#define RLIM_INFINITY (~0UL) - -#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 }, \ - { 0, 0 }, \ - { INR_OPEN, INR_OPEN }, \ - { MLOCK_LIMIT, MLOCK_LIMIT }, \ - { RLIM_INFINITY, RLIM_INFINITY }, \ - { RLIM_INFINITY, RLIM_INFINITY }, \ - { MAX_SIGPENDING, MAX_SIGPENDING }, \ - { MQ_BYTES_MAX, MQ_BYTES_MAX }, \ -} - -#endif /* __KERNEL__ */ +#include #endif /* __V850_RESOURCE_H__ */ diff -puN include/asm-x86_64/resource.h~consolidate-arch-specific-resourceh-headers include/asm-x86_64/resource.h --- 25/include/asm-x86_64/resource.h~consolidate-arch-specific-resourceh-headers 2005-01-19 18:11:31.233872016 -0800 +++ 25-akpm/include/asm-x86_64/resource.h 2005-01-19 18:11:31.247869888 -0800 @@ -1,51 +1,6 @@ #ifndef _X8664_RESOURCE_H #define _X8664_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_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 - -/* - * SuS says limits have to be unsigned. - * Which makes a ton more sense anyway. - */ -#define RLIM_INFINITY (~0UL) - -#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 }, \ - { 0, 0 }, \ - { INR_OPEN, INR_OPEN }, \ - { MLOCK_LIMIT, MLOCK_LIMIT }, \ - { RLIM_INFINITY, RLIM_INFINITY }, \ - { RLIM_INFINITY, RLIM_INFINITY }, \ - { MAX_SIGPENDING, MAX_SIGPENDING }, \ - { MQ_BYTES_MAX, MQ_BYTES_MAX }, \ -} - -#endif /* __KERNEL__ */ +#include #endif _