4 files changed, 44 insertions, 45 deletions

diff --git a/mm/internal.h b/mm/internal.h
index 9d0ced8e505e..d071d380fb49 100644
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -66,6 +66,10 @@ static inline unsigned long page_order(struct page *page)
         return page_private(page);
 }
 
+/* mm/util.c */
+void __vma_link_list(struct mm_struct *mm, struct vm_area_struct *vma,
+                struct vm_area_struct *prev, struct rb_node *rb_parent);
+
 #ifdef CONFIG_MMU
 extern long mlock_vma_pages_range(struct vm_area_struct *vma,
                         unsigned long start, unsigned long end);
diff --git a/mm/mmap.c b/mm/mmap.c
index 4fb5464f7707..e76f8d752884 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -398,29 +398,6 @@ find_vma_prepare(struct mm_struct *mm, unsigned long addr,
         return vma;
 }
 
-static inline 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 *next;
-
-        vma->vm_prev = prev;
-        if (prev) {
-                next = prev->vm_next;
-                prev->vm_next = vma;
-        } else {
-                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_link_rb(struct mm_struct *mm, struct vm_area_struct *vma,
                 struct rb_node **rb_link, struct rb_node *rb_parent)
 {
diff --git a/mm/nommu.c b/mm/nommu.c
index 5afce48ce339..0b16cb4c517b 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -680,9 +680,9 @@ static void protect_vma(struct vm_area_struct *vma, unsigned long flags)
  */
 static void add_vma_to_mm(struct mm_struct *mm, struct vm_area_struct *vma)
 {
-        struct vm_area_struct *pvma, **pp, *next;
+        struct vm_area_struct *pvma, *prev;
         struct address_space *mapping;
-        struct rb_node **p, *parent;
+        struct rb_node **p, *parent, *rb_prev;
 
         kenter(",%p", vma);
 
@@ -703,7 +703,7 @@ static void add_vma_to_mm(struct mm_struct *mm, struct vm_area_struct *vma)
         }
 
         /* add the VMA to the tree */
-        parent = NULL;
+        parent = rb_prev = NULL;
         p = &mm->mm_rb.rb_node;
         while (*p) {
                 parent = *p;
@@ -713,17 +713,20 @@ static void add_vma_to_mm(struct mm_struct *mm, struct vm_area_struct *vma)
                  * (the latter is necessary as we may get identical VMAs) */
                 if (vma->vm_start < pvma->vm_start)
                         p = &(*p)->rb_left;
-                else if (vma->vm_start > pvma->vm_start)
+                else if (vma->vm_start > pvma->vm_start) {
+                        rb_prev = parent;
                         p = &(*p)->rb_right;
-                else if (vma->vm_end < pvma->vm_end)
+                } else if (vma->vm_end < pvma->vm_end)
                         p = &(*p)->rb_left;
-                else if (vma->vm_end > pvma->vm_end)
+                else if (vma->vm_end > pvma->vm_end) {
+                        rb_prev = parent;
                         p = &(*p)->rb_right;
-                else if (vma < pvma)
+                } else if (vma < pvma)
                         p = &(*p)->rb_left;
-                else if (vma > pvma)
+                else if (vma > pvma) {
+                        rb_prev = parent;
                         p = &(*p)->rb_right;
-                else
+                } else
                         BUG();
         }
 
@@ -731,20 +734,11 @@ static void add_vma_to_mm(struct mm_struct *mm, struct vm_area_struct *vma)
         rb_insert_color(&vma->vm_rb, &mm->mm_rb);
 
         /* add VMA to the VMA list also */
-        for (pp = &mm->mmap; (pvma = *pp); pp = &(*pp)->vm_next) {
-                if (pvma->vm_start > vma->vm_start)
-                        break;
-                if (pvma->vm_start < vma->vm_start)
-                        continue;
-                if (pvma->vm_end < vma->vm_end)
-                        break;
-        }
+        prev = NULL;
+        if (rb_prev)
+                prev = rb_entry(rb_prev, struct vm_area_struct, vm_rb);
 
-        next = *pp;
-        *pp = vma;
-        vma->vm_next = next;
-        if (next)
-                next->vm_prev = vma;
+        __vma_link_list(mm, vma, prev, parent);
 }
 
 /*
diff --git a/mm/util.c b/mm/util.c
index e7b103a6fd21..88ea1bd661c0 100644
--- a/mm/util.c
+++ b/mm/util.c
@@ -6,6 +6,8 @@
 #include <linux/sched.h>
 #include <asm/uaccess.h>
 
+#include "internal.h"
+
 #define CREATE_TRACE_POINTS
 #include <trace/events/kmem.h>
 
@@ -215,6 +217,28 @@ char *strndup_user(const char __user *s, long n)
 }
 EXPORT_SYMBOL(strndup_user);
 
+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 *next;
+
+        vma->vm_prev = prev;
+        if (prev) {
+                next = prev->vm_next;
+                prev->vm_next = vma;
+        } else {
+                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;
+}
+
 #if defined(CONFIG_MMU) && !defined(HAVE_ARCH_PICK_MMAP_LAYOUT)
 void arch_pick_mmap_layout(struct mm_struct *mm)
 {