diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-26 22:42:08 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-26 22:42:08 -0500 |
| commit | 0685ab4fb8e527639d9867df60d49dccba85d842 (patch) | |
| tree | 7d7db22548b95da9555afec2889a9e8efa2053d9 /include | |
| parent | ff1ea52fa317a5658b6415b25169c5e531f54876 (diff) | |
| parent | f7b9329e556a8bdb9e07292cddbbe484c7a2b8c5 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched
* git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched:
sched: bump version of kernel/sched_debug.c
sched: fix minimum granularity tunings
sched: fix RLIMIT_CPU comment
sched: fix kernel/acct.c comment
sched: fix prev_stime calculation
sched: don't forget to unlock uids_mutex on error paths
Diffstat (limited to 'include')
| -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 cfe3692b23e5..a4a22cc35898 100644 --- a/include/asm-generic/resource.h +++ b/include/asm-generic/resource.h | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | * then it defines them prior including asm-generic/resource.h. ) | 12 | * then it defines them prior including asm-generic/resource.h. ) |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #define RLIMIT_CPU 0 /* CPU time in ms */ | 15 | #define RLIMIT_CPU 0 /* CPU time in sec */ |
| 16 | #define RLIMIT_FSIZE 1 /* Maximum filesize */ | 16 | #define RLIMIT_FSIZE 1 /* Maximum filesize */ |
| 17 | #define RLIMIT_DATA 2 /* max data size */ | 17 | #define RLIMIT_DATA 2 /* max data size */ |
| 18 | #define RLIMIT_STACK 3 /* max stack size */ | 18 | #define RLIMIT_STACK 3 /* max stack size */ |