diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-30 20:37:44 -0500 | 
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-30 20:37:44 -0500 | 
| commit | 9e0cb06b17be7e562cbdaba2768649f025826dc6 (patch) | |
| tree | aaf5ef8c6cd11764d222df9c446ad9af17e0020e /fs/proc/array.c | |
| parent | 23da0c20ef1c1f0432f373e0e2233a6b6ab2678f (diff) | |
| parent | 6e9d6b8ee4e0c37d3952256e6472c57490d6780d (diff) | |
Merge branch 'master'
Diffstat (limited to 'fs/proc/array.c')
| -rw-r--r-- | fs/proc/array.c | 2 | 
1 files changed, 1 insertions, 1 deletions
| diff --git a/fs/proc/array.c b/fs/proc/array.c index d84eecacbeaf..3e1239e4b303 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c | |||
| @@ -438,7 +438,7 @@ static int do_task_stat(struct task_struct *task, char * buffer, int whole) | |||
| 438 | jiffies_to_clock_t(it_real_value), | 438 | jiffies_to_clock_t(it_real_value), | 
| 439 | start_time, | 439 | start_time, | 
| 440 | vsize, | 440 | vsize, | 
| 441 | mm ? get_mm_counter(mm, rss) : 0, /* you might want to shift this left 3 */ | 441 | mm ? get_mm_rss(mm) : 0, | 
| 442 | rsslim, | 442 | rsslim, | 
| 443 | mm ? mm->start_code : 0, | 443 | mm ? mm->start_code : 0, | 
| 444 | mm ? mm->end_code : 0, | 444 | mm ? mm->end_code : 0, | 
