- patches.arch/x86_mce_intel_decode_physical_address.patch:

[linux-flexiantxendom0-3.2.10.git] / mm / mmap.c

diff --git a/mm/mmap.c b/mm/mmap.c
index db6d113..48452aa 100644 (file)
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1944,14 +1944,6 @@ static void unmap_region(struct mm_struct *mm,
        tlb_finish_mmu(tlb, start, end);
 }
 
-static inline void unmap_vma(struct vm_area_struct *vma)
-{
-#ifdef CONFIG_XEN
-       if (unlikely(vma->vm_ops && vma->vm_ops->unmap))
-               vma->vm_ops->unmap(vma);
-#endif
-}
-
 /*
  * Create a list of vma's touched by the unmap, removing them from the mm's
  * vma list as we go..
@@ -1967,7 +1959,6 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma,
        insertion_point = (prev ? &prev->vm_next : &mm->mmap);
        do {
                rb_erase(&vma->vm_rb, &mm->mm_rb);
-               unmap_vma(vma);
                mm->map_count--;
                tail_vma = vma;
                vma = vma->vm_next;
@@ -2306,11 +2297,6 @@ void exit_mmap(struct mm_struct *mm)
 
        arch_exit_mmap(mm);
 
-#ifdef CONFIG_XEN
-       for (vma = mm->mmap; vma; vma = vma->vm_next)
-               unmap_vma(vma);
-#endif
-
        vma = mm->mmap;
        if (!vma)       /* Can happen if dup_mmap() received an OOM */
                return;