Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mm: nommu: don't scan the vma list when deleting

Browse source 
Since commit 297c5eee37 ("mm: make the vma list be doubly linked") made
it a doubly linked list, we don't need to scan the list when deleting
@vma.

And the original code didn't update the prev pointer. Fix it too.

Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Acked-by: Greg Ungerer <gerg@uclinux.org>
Cc: David Howells <dhowells@redhat.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Namhyung Kim 2011-05-24 17:11:23 -07:00 committed by Linus Torvalds
parent 6038def0d1
commit b951bf2c46
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
mm/nommu.c
View file

@ -746,7 +746,6 @@ static void add_vma_to_mm(struct mm_struct *mm, struct vm_area_struct *vma)
*/ */
static void delete_vma_from_mm(struct vm_area_struct *vma) static void delete_vma_from_mm(struct vm_area_struct *vma)
{ {
struct vm_area_struct **pp;
struct address_space *mapping; struct address_space *mapping;
struct mm_struct *mm = vma->vm_mm; struct mm_struct *mm = vma->vm_mm;
@ -769,12 +768,14 @@ static void delete_vma_from_mm(struct vm_area_struct *vma)
/* remove from the MM's tree and list */ /* remove from the MM's tree and list */
rb_erase(&vma->vm_rb, &mm->mm_rb); rb_erase(&vma->vm_rb, &mm->mm_rb);
for (pp = &mm->mmap; *pp; pp = &(*pp)->vm_next) {
if (*pp == vma) { if (vma->vm_prev)
*pp = vma->vm_next; vma->vm_prev->vm_next = vma->vm_next;
break; else
} mm->mmap = vma->vm_next;
}
if (vma->vm_next)
vma->vm_next->vm_prev = vma->vm_prev;
vma->vm_mm = NULL; vma->vm_mm = NULL;
} }