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

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

diff --git a/mm/util.c b/mm/util.c
index 3ad6db9..988d11e 100644 (file)
--- a/mm/util.c
+++ b/mm/util.c
@@ -271,7 +271,7 @@ void *memdup_user_nul(const void __user *src, size_t len)
 EXPORT_SYMBOL(memdup_user_nul);
 
 void __vma_link_list(struct mm_struct *mm, struct vm_area_struct *vma,
-               struct vm_area_struct *prev, struct rb_node *rb_parent)
+               struct vm_area_struct *prev)
 {
        struct vm_area_struct *next;
 
@@ -280,18 +280,28 @@ void __vma_link_list(struct mm_struct *mm, struct vm_area_struct *vma,
                next = prev->vm_next;
                prev->vm_next = vma;
        } else {
+               next = mm->mmap;
                mm->mmap = vma;
-               if (rb_parent)
-                       next = rb_entry(rb_parent,
-                                       struct vm_area_struct, vm_rb);
-               else
-                       next = NULL;
        }
        vma->vm_next = next;
        if (next)
                next->vm_prev = vma;
 }
 
+void __vma_unlink_list(struct mm_struct *mm, struct vm_area_struct *vma)
+{
+       struct vm_area_struct *prev, *next;
+
+       next = vma->vm_next;
+       prev = vma->vm_prev;
+       if (prev)
+               prev->vm_next = next;
+       else
+               mm->mmap = next;
+       if (next)
+               next->vm_prev = prev;
+}
+
 /* Check if the vma is being used as a stack by this task */
 int vma_is_stack_for_current(struct vm_area_struct *vma)
 {