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 /kernel/acct.c | |
| 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 'kernel/acct.c')
| -rw-r--r-- | kernel/acct.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/acct.c b/kernel/acct.c index fce53d8df8a7..cf19547cc9e4 100644 --- a/kernel/acct.c +++ b/kernel/acct.c | |||
| @@ -413,7 +413,7 @@ static u32 encode_float(u64 value) | |||
| 413 | * The acct_process() call is the workhorse of the process | 413 | * The acct_process() call is the workhorse of the process |
| 414 | * accounting system. The struct acct is built here and then written | 414 | * accounting system. The struct acct is built here and then written |
| 415 | * into the accounting file. This function should only be called from | 415 | * into the accounting file. This function should only be called from |
| 416 | * do_exit(). | 416 | * do_exit() or when switching to a different output file. |
| 417 | */ | 417 | */ |
| 418 | 418 | ||
| 419 | /* | 419 | /* |