diff options
| author | Steven J. Magnani <steve@digidescorp.com> | 2009-12-14 18:00:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-15 08:53:24 -0800 |
| commit | 7e1e0ef22c9ba9f797d7c4448feee722584bba5c (patch) | |
| tree | 892fd5374f4815891065f148617fefc601e19219 /fs/proc | |
| parent | ea637639591def87a54cea811cbac796980cb30d (diff) | |
| download | linux-7e1e0ef22c9ba9f797d7c4448feee722584bba5c.tar.gz linux-7e1e0ef22c9ba9f797d7c4448feee722584bba5c.tar.bz2 linux-7e1e0ef22c9ba9f797d7c4448feee722584bba5c.zip | |
procfs: use proper units for noMMU statm
On no-MMU systems, sizes reported in /proc/n/statm have units of bytes.
Per Documentation/filesystems/proc.txt, these values should be in pages.
Signed-off-by: Steven J. Magnani <steve@digidescorp.com>
Cc: Greg Ungerer <gerg@snapgear.com>
Cc: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/proc')
| -rw-r--r-- | fs/proc/task_nommu.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c index 8f5c05d3dbd3..5d9fd64ef81a 100644 --- a/fs/proc/task_nommu.c +++ b/fs/proc/task_nommu.c @@ -110,9 +110,13 @@ int task_statm(struct mm_struct *mm, int *shared, int *text, } } - size += (*text = mm->end_code - mm->start_code); - size += (*data = mm->start_stack - mm->start_data); + *text = (PAGE_ALIGN(mm->end_code) - (mm->start_code & PAGE_MASK)) + >> PAGE_SHIFT; + *data = (PAGE_ALIGN(mm->start_stack) - (mm->start_data & PAGE_MASK)) + >> PAGE_SHIFT; up_read(&mm->mmap_sem); + size >>= PAGE_SHIFT; + size += *text + *data; *resident = size; return size; } |