---

yaml --- r: 176320 b: refs/heads/master c: 7e1e0ef h: refs/heads/master v: v3
git-mirror · Dec 15, 2009 · 050edc9 · 050edc9
1 parent 350c463
commit 050edc9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea637639591def87a54cea811cbac796980cb30d
+refs/heads/master: 7e1e0ef22c9ba9f797d7c4448feee722584bba5c
diff --git a/trunk/fs/proc/task_nommu.c b/trunk/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;
 }