diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /include/asm-generic/resource.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'include/asm-generic/resource.h')
| -rw-r--r-- | include/asm-generic/resource.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-generic/resource.h b/include/asm-generic/resource.h index 587566f95f6c..61fa862fe08d 100644 --- a/include/asm-generic/resource.h +++ b/include/asm-generic/resource.h | |||
| @@ -78,7 +78,7 @@ | |||
| 78 | [RLIMIT_CORE] = { 0, RLIM_INFINITY }, \ | 78 | [RLIMIT_CORE] = { 0, RLIM_INFINITY }, \ |
| 79 | [RLIMIT_RSS] = { RLIM_INFINITY, RLIM_INFINITY }, \ | 79 | [RLIMIT_RSS] = { RLIM_INFINITY, RLIM_INFINITY }, \ |
| 80 | [RLIMIT_NPROC] = { 0, 0 }, \ | 80 | [RLIMIT_NPROC] = { 0, 0 }, \ |
| 81 | [RLIMIT_NOFILE] = { INR_OPEN, INR_OPEN }, \ | 81 | [RLIMIT_NOFILE] = { INR_OPEN_CUR, INR_OPEN_MAX }, \ |
| 82 | [RLIMIT_MEMLOCK] = { MLOCK_LIMIT, MLOCK_LIMIT }, \ | 82 | [RLIMIT_MEMLOCK] = { MLOCK_LIMIT, MLOCK_LIMIT }, \ |
| 83 | [RLIMIT_AS] = { RLIM_INFINITY, RLIM_INFINITY }, \ | 83 | [RLIMIT_AS] = { RLIM_INFINITY, RLIM_INFINITY }, \ |
| 84 | [RLIMIT_LOCKS] = { RLIM_INFINITY, RLIM_INFINITY }, \ | 84 | [RLIMIT_LOCKS] = { RLIM_INFINITY, RLIM_INFINITY }, \ |