Clean up tlb_start/end_vma.

diff --git a/include/asm-i386/tlb.h b/include/asm-i386/tlb.h
index b91e6abd1fd49498f366084bd0b8f86f8705d661..844c3d4c9aaaff22a2aff8ff7637f21f4d4dc123 100644 (file)
--- a/include/asm-i386/tlb.h
+++ b/include/asm-i386/tlb.h
@@ -5,8 +5,8 @@
  * x86 doesn't need any special per-pte or
  * per-vma handling..
  */
-#define tlb_start_vma(tlb, vma, start, end) do { } while (0)
-#define tlb_end_vma(tlb, vma, start, end) do { } while (0)
+#define tlb_start_vma(tlb, vma) do { } while (0)
+#define tlb_end_vma(tlb, vma) do { } while (0)
 #define tlb_remove_tlb_entry(tlb, pte, address) do { } while (0)
 
 /*

diff --git a/include/asm-sparc64/tlb.h b/include/asm-sparc64/tlb.h
index f0e011119b4018cf843ba21ec97be9f39d66b29b..ebc228702646adaa3b316a95e4005469f1a66283 100644 (file)
--- a/include/asm-sparc64/tlb.h
+++ b/include/asm-sparc64/tlb.h
@@ -3,10 +3,10 @@
 
 #define tlb_flush(tlb)         flush_tlb_mm((tlb)->mm)
 
-#define tlb_start_vma(tlb, vma, start, end) \
-       flush_cache_range(vma, start, end)
-#define tlb_end_vma(tlb, vma, start, end) \
-       flush_tlb_range(vma, start, end)
+#define tlb_start_vma(tlb, vma) \
+       flush_cache_range(vma, vma->vm_start, vma->vm_end)
+#define tlb_end_vma(tlb, vma) \
+       flush_tlb_range(vma, vma->vm_start, vma->vm_end)
 
 #define tlb_remove_tlb_entry(tlb, pte, address) do { } while (0)
 

diff --git a/mm/memory.c b/mm/memory.c
index 0b15a0042600b8a7297beb73100194e5bede3d32..280c4964bbc98ad93b2478d2265458aa21f61cef 100644 (file)
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -387,19 +387,18 @@ static void zap_pmd_range(mmu_gather_t *tlb, pgd_t * dir, unsigned long address,
 
 void unmap_page_range(mmu_gather_t *tlb, struct vm_area_struct *vma, unsigned long address, unsigned long end)
 {
-       unsigned long start = address;
        pgd_t * dir;
 
        if (address >= end)
                BUG();
        dir = pgd_offset(vma->vm_mm, address);
-       tlb_start_vma(tlb, vma, start, end);
+       tlb_start_vma(tlb, vma);
        do {
                zap_pmd_range(tlb, dir, address, end - address);
                address = (address + PGDIR_SIZE) & PGDIR_MASK;
                dir++;
        } while (address && (address < end));
-       tlb_end_vma(tlb, vma, start, end);
+       tlb_end_vma(tlb, vma);
 }
 
 /*