From: Bernd Schmidt <[email protected]>
Dont use kobjsize on the area belonging to a VMA, as it's allocated with
get_free_pages.
Signed-off-by: Bernd Schmidt <[email protected]>
Signed-off-by: Bryan Wu <[email protected]>
---
fs/proc/task_nommu.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
index 1932c2c..1d0513e 100644
--- a/fs/proc/task_nommu.c
+++ b/fs/proc/task_nommu.c
@@ -76,7 +76,7 @@ unsigned long task_vsize(struct mm_struct *mm)
down_read(&mm->mmap_sem);
for (tbp = mm->context.vmlist; tbp; tbp = tbp->next) {
if (tbp->vma)
- vsize += kobjsize((void *) tbp->vma->vm_start);
+ vsize += tbp->vma->vm_end - tbp->vma->vm_start;
}
up_read(&mm->mmap_sem);
return vsize;
@@ -93,7 +93,7 @@ int task_statm(struct mm_struct *mm, int *shared, int *text,
size += kobjsize(tbp);
if (tbp->vma) {
size += kobjsize(tbp->vma);
- size += kobjsize((void *) tbp->vma->vm_start);
+ size += tbp->vma->vm_end - tbp->vma->vm_start;
}
}
--
1.5.3.4
Bryan Wu wrote:
> From: Bernd Schmidt <[email protected]>
>
> Dont use kobjsize on the area belonging to a VMA, as it's allocated with
> get_free_pages.
As far as I remember, that's the case only in our tree with the patches
in nommu.c. So this patch probably shouldn't go upstream yet.
Bernd
--
This footer brought to you by insane German lawmakers.
Analog Devices GmbH Wilhelm-Wagenfeld-Str. 6 80807 Muenchen
Sitz der Gesellschaft Muenchen, Registergericht Muenchen HRB 40368
Geschaeftsfuehrer Thomas Wessel, William A. Martin, Margaret Seif
On Jan 30, 2008 9:04 PM, Bernd Schmidt <[email protected]> wrote:
> Bryan Wu wrote:
> > From: Bernd Schmidt <[email protected]>
> >
> > Dont use kobjsize on the area belonging to a VMA, as it's allocated with
> > get_free_pages.
>
> As far as I remember, that's the case only in our tree with the patches
> in nommu.c. So this patch probably shouldn't go upstream yet.
>
Oh, I picked up a wrong one. Could you please tell me which nommu.c
pathes does this one depends on?
I am sorting out all our nommu changes and try to send them out.
Thanks
-Bryan
Bryan Wu wrote:
> On Jan 30, 2008 9:04 PM, Bernd Schmidt <[email protected]> wrote:
>> Bryan Wu wrote:
>>> From: Bernd Schmidt <[email protected]>
>>>
>>> Dont use kobjsize on the area belonging to a VMA, as it's allocated with
>>> get_free_pages.
>> As far as I remember, that's the case only in our tree with the patches
>> in nommu.c. So this patch probably shouldn't go upstream yet.
>>
>
> Oh, I picked up a wrong one. Could you please tell me which nommu.c
> pathes does this one depends on?
> I am sorting out all our nommu changes and try to send them out.
Leave them out for now. I think David half-nacked them last time I
posted them, so we'll need to work something out.
Bernd
--
This footer brought to you by insane German lawmakers.
Analog Devices GmbH Wilhelm-Wagenfeld-Str. 6 80807 Muenchen
Sitz der Gesellschaft Muenchen, Registergericht Muenchen HRB 40368
Geschaeftsfuehrer Thomas Wessel, William A. Martin, Margaret Seif