6 files changed, 5 insertions, 58 deletions

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 44d3fc25f55..25ef49c1f2b 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -87,7 +87,6 @@ extern unsigned int kobjsize(const void *objp);
 #define VM_PFNMAP       0x00000400      /* Page-ranges managed without "struct page", just pure PFN */
 #define VM_DENYWRITE    0x00000800      /* ETXTBSY on write attempts.. */
 
-#define VM_EXECUTABLE   0x00001000
 #define VM_LOCKED       0x00002000
 #define VM_IO           0x00004000      /* Memory mapped I/O or similar */
 
@@ -1396,9 +1395,6 @@ extern void exit_mmap(struct mm_struct *);
 extern int mm_take_all_locks(struct mm_struct *mm);
 extern void mm_drop_all_locks(struct mm_struct *mm);
 
-/* From fs/proc/base.c. callers must _not_ hold the mm's exe_file_lock */
-extern void added_exe_file_vma(struct mm_struct *mm);
-extern void removed_exe_file_vma(struct mm_struct *mm);
 extern void set_mm_exe_file(struct mm_struct *mm, struct file *new_exe_file);
 extern struct file *get_mm_exe_file(struct mm_struct *mm);
 
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index bf7867200b9..58d3173eb36 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -394,7 +394,6 @@ struct mm_struct {
 
         /* store ref to file /proc/<pid>/exe symlink points to */
         struct file *exe_file;
-        unsigned long num_exe_file_vmas;
 #ifdef CONFIG_MMU_NOTIFIER
         struct mmu_notifier_mm *mmu_notifier_mm;
 #endif
diff --git a/include/linux/mman.h b/include/linux/mman.h
index 8b74e9b1d0a..77cec2f45cb 100644
--- a/include/linux/mman.h
+++ b/include/linux/mman.h
@@ -86,7 +86,6 @@ calc_vm_flag_bits(unsigned long flags)
 {
         return _calc_vm_trans(flags, MAP_GROWSDOWN,  VM_GROWSDOWN ) |
                _calc_vm_trans(flags, MAP_DENYWRITE,  VM_DENYWRITE ) |
-               _calc_vm_trans(flags, MAP_EXECUTABLE, VM_EXECUTABLE) |
                _calc_vm_trans(flags, MAP_LOCKED,     VM_LOCKED    );
 }
 #endif /* __KERNEL__ */
diff --git a/kernel/fork.c b/kernel/fork.c
index a57a993681e..ec667f797af 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -622,26 +622,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,7 +629,6 @@ 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)
diff --git a/mm/mmap.c b/mm/mmap.c
index d0686d35511..c1ad2e78ea5 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -231,11 +231,8 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
         might_sleep();
         if (vma->vm_ops && vma->vm_ops->close)
                 vma->vm_ops->close(vma);
-        if (vma->vm_file) {
+        if (vma->vm_file)
                 fput(vma->vm_file);
-                if (vma->vm_flags & VM_EXECUTABLE)
-                        removed_exe_file_vma(vma->vm_mm);
-        }
         mpol_put(vma_policy(vma));
         kmem_cache_free(vm_area_cachep, vma);
         return next;
@@ -636,8 +633,6 @@ again:			remove_next = 1 + (end > next->vm_end);
                 if (file) {
                         uprobe_munmap(next, next->vm_start, next->vm_end);
                         fput(file);
-                        if (next->vm_flags & VM_EXECUTABLE)
-                                removed_exe_file_vma(mm);
                 }
                 if (next->anon_vma)
                         anon_vma_merge(vma, next);
@@ -1304,8 +1299,6 @@ munmap_back:
                 error = file->f_op->mmap(file, vma);
                 if (error)
                         goto unmap_and_free_vma;
-                if (vm_flags & VM_EXECUTABLE)
-                        added_exe_file_vma(mm);
 
                 /* Can addr have changed??
                  *
@@ -1987,11 +1980,8 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
         if (anon_vma_clone(new, vma))
                 goto out_free_mpol;
 
-        if (new->vm_file) {
+        if (new->vm_file)
                 get_file(new->vm_file);
-                if (vma->vm_flags & VM_EXECUTABLE)
-                        added_exe_file_vma(mm);
-        }
 
         if (new->vm_ops && new->vm_ops->open)
                 new->vm_ops->open(new);
@@ -2009,11 +1999,8 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
         /* Clean everything up if vma_adjust failed. */
         if (new->vm_ops && new->vm_ops->close)
                 new->vm_ops->close(new);
-        if (new->vm_file) {
-                if (vma->vm_flags & VM_EXECUTABLE)
-                        removed_exe_file_vma(mm);
+        if (new->vm_file)
                 fput(new->vm_file);
-        }
         unlink_anon_vmas(new);
  out_free_mpol:
         mpol_put(pol);
@@ -2408,12 +2395,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
                         new_vma->vm_start = addr;
                         new_vma->vm_end = addr + len;
                         new_vma->vm_pgoff = pgoff;
-                        if (new_vma->vm_file) {
+                        if (new_vma->vm_file)
                                 get_file(new_vma->vm_file);
-
-                                if (vma->vm_flags & VM_EXECUTABLE)
-                                        added_exe_file_vma(mm);
-                        }
                         if (new_vma->vm_ops && new_vma->vm_ops->open)
                                 new_vma->vm_ops->open(new_vma);
                         vma_link(mm, new_vma, prev, rb_link, rb_parent);
diff --git a/mm/nommu.c b/mm/nommu.c
index 98318dcff74..9c4a7b63a4d 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -789,11 +789,8 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
         kenter("%p", vma);
         if (vma->vm_ops && vma->vm_ops->close)
                 vma->vm_ops->close(vma);
-        if (vma->vm_file) {
+        if (vma->vm_file)
                 fput(vma->vm_file);
-                if (vma->vm_flags & VM_EXECUTABLE)
-                        removed_exe_file_vma(mm);
-        }
         put_nommu_region(vma->vm_region);
         kmem_cache_free(vm_area_cachep, vma);
 }
@@ -1284,10 +1281,6 @@ unsigned long do_mmap_pgoff(struct file *file,
         if (file) {
                 region->vm_file = get_file(file);
                 vma->vm_file = get_file(file);
-                if (vm_flags & VM_EXECUTABLE) {
-                        added_exe_file_vma(current->mm);
-                        vma->vm_mm = current->mm;
-                }
         }
 
         down_write(&nommu_region_sem);
@@ -1440,8 +1433,6 @@ error:
         kmem_cache_free(vm_region_jar, region);
         if (vma->vm_file)
                 fput(vma->vm_file);
-        if (vma->vm_flags & VM_EXECUTABLE)
-                removed_exe_file_vma(vma->vm_mm);
         kmem_cache_free(vm_area_cachep, vma);
         kleave(" = %d", ret);
         return ret;