1 files changed, 7 insertions, 25 deletions

diff --git a/kernel/fork.c b/kernel/fork.c
index a2b1efc20928..1cd7d581b3b2 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -423,7 +423,12 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
                                 mapping->i_mmap_writable++;
                         flush_dcache_mmap_lock(mapping);
                         /* insert tmp into the share list, just after mpnt */
-                        vma_prio_tree_add(tmp, mpnt);
+                        if (unlikely(tmp->vm_flags & VM_NONLINEAR))
+                                vma_nonlinear_insert(tmp,
+                                                &mapping->i_mmap_nonlinear);
+                        else
+                                vma_interval_tree_insert_after(tmp, mpnt,
+                                                        &mapping->i_mmap);
                         flush_dcache_mmap_unlock(mapping);
                         mutex_unlock(&mapping->i_mmap_mutex);
                 }
@@ -622,26 +627,6 @@ void mmput(struct mm_struct *mm)
 }
 EXPORT_SYMBOL_GPL(mmput);
 
-/*
- * We added or removed a vma mapping the executable. The vmas are only mapped
- * during exec and are not mapped with the mmap system call.
- * Callers must hold down_write() on the mm's mmap_sem for these
- */
-void added_exe_file_vma(struct mm_struct *mm)
-{
-        mm->num_exe_file_vmas++;
-}
-
-void removed_exe_file_vma(struct mm_struct *mm)
-{
-        mm->num_exe_file_vmas--;
-        if ((mm->num_exe_file_vmas == 0) && mm->exe_file) {
-                fput(mm->exe_file);
-                mm->exe_file = NULL;
-        }
-
-}
-
 void set_mm_exe_file(struct mm_struct *mm, struct file *new_exe_file)
 {
         if (new_exe_file)
@@ -649,15 +634,13 @@ void set_mm_exe_file(struct mm_struct *mm, struct file *new_exe_file)
         if (mm->exe_file)
                 fput(mm->exe_file);
         mm->exe_file = new_exe_file;
-        mm->num_exe_file_vmas = 0;
 }
 
 struct file *get_mm_exe_file(struct mm_struct *mm)
 {
         struct file *exe_file;
 
-        /* We need mmap_sem to protect against races with removal of
-         * VM_EXECUTABLE vmas */
+        /* We need mmap_sem to protect against races with removal of exe_file */
         down_read(&mm->mmap_sem);
         exe_file = mm->exe_file;
         if (exe_file)
@@ -1078,7 +1061,6 @@ static int copy_signal(unsigned long clone_flags, struct task_struct *tsk)
         init_rwsem(&sig->group_rwsem);
 #endif
 
-        sig->oom_adj = current->signal->oom_adj;
         sig->oom_score_adj = current->signal->oom_score_adj;
         sig->oom_score_adj_min = current->signal->oom_score_adj_min;