Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf

[linux-2.6-microblaze.git] / mm / nommu.c

diff --git a/mm/nommu.c b/mm/nommu.c
index 7de5920..bd2b4e5 100644 (file)
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -648,7 +648,7 @@ static void add_vma_to_mm(struct mm_struct *mm, struct vm_area_struct *vma)
        if (rb_prev)
                prev = rb_entry(rb_prev, struct vm_area_struct, vm_rb);
 
-       __vma_link_list(mm, vma, prev, parent);
+       __vma_link_list(mm, vma, prev);
 }
 
 /*
@@ -684,13 +684,7 @@ static void delete_vma_from_mm(struct vm_area_struct *vma)
        /* remove from the MM's tree and list */
        rb_erase(&vma->vm_rb, &mm->mm_rb);
 
-       if (vma->vm_prev)
-               vma->vm_prev->vm_next = vma->vm_next;
-       else
-               mm->mmap = vma->vm_next;
-
-       if (vma->vm_next)
-               vma->vm_next->vm_prev = vma->vm_prev;
+       __vma_unlink_list(mm, vma);
 }
 
 /*