Merge branch 'syscalls-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo...

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

diff --git a/mm/nommu.c b/mm/nommu.c
index cad3296..4f87202 100644 (file)
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -662,22 +662,6 @@ static void put_nommu_region(struct vm_region *region)
        __put_nommu_region(region);
 }
 
-/*
- * update protection on a vma
- */
-static void protect_vma(struct vm_area_struct *vma, unsigned long flags)
-{
-#ifdef CONFIG_MPU
-       struct mm_struct *mm = vma->vm_mm;
-       long start = vma->vm_start & PAGE_MASK;
-       while (start < vma->vm_end) {
-               protect_page(mm, start, flags);
-               start += PAGE_SIZE;
-       }
-       update_protections(mm);
-#endif
-}
-
 /*
  * add a VMA into a process's mm_struct in the appropriate place in the list
  * and tree and add to the address space's page tree also if not an anonymous
@@ -695,8 +679,6 @@ static void add_vma_to_mm(struct mm_struct *mm, struct vm_area_struct *vma)
        mm->map_count++;
        vma->vm_mm = mm;
 
-       protect_vma(vma, vma->vm_flags);
-
        /* add the VMA to the mapping */
        if (vma->vm_file) {
                mapping = vma->vm_file->f_mapping;
@@ -757,8 +739,6 @@ static void delete_vma_from_mm(struct vm_area_struct *vma)
        struct mm_struct *mm = vma->vm_mm;
        struct task_struct *curr = current;
 
-       protect_vma(vma, 0);
-
        mm->map_count--;
        for (i = 0; i < VMACACHE_SIZE; i++) {
                /* if the vma is cached, invalidate the entire cache */