Merge tag 'powerpc-6.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[sfrench/cifs-2.6.git] / arch / powerpc / include / asm / book3s / 64 / tlbflush.h

diff --git a/arch/powerpc/include/asm/book3s/64/tlbflush.h b/arch/powerpc/include/asm/book3s/64/tlbflush.h
index 67655cd6054563bbdcbd84396921a5f05ff419d4..dd39313242b4d964e9badbaca4a167e5ec56f4f3 100644 (file)
--- a/arch/powerpc/include/asm/book3s/64/tlbflush.h
+++ b/arch/powerpc/include/asm/book3s/64/tlbflush.h
@@ -47,8 +47,7 @@ static inline void flush_pmd_tlb_range(struct vm_area_struct *vma,
                                       unsigned long start, unsigned long end)
 {
        if (radix_enabled())
-               return radix__flush_pmd_tlb_range(vma, start, end);
-       return hash__flush_tlb_range(vma, start, end);
+               radix__flush_pmd_tlb_range(vma, start, end);
 }
 
 #define __HAVE_ARCH_FLUSH_HUGETLB_TLB_RANGE
@@ -57,81 +56,65 @@ static inline void flush_hugetlb_tlb_range(struct vm_area_struct *vma,
                                           unsigned long end)
 {
        if (radix_enabled())
-               return radix__flush_hugetlb_tlb_range(vma, start, end);
-       return hash__flush_tlb_range(vma, start, end);
+               radix__flush_hugetlb_tlb_range(vma, start, end);
 }
 
 static inline void flush_tlb_range(struct vm_area_struct *vma,
                                   unsigned long start, unsigned long end)
 {
        if (radix_enabled())
-               return radix__flush_tlb_range(vma, start, end);
-       return hash__flush_tlb_range(vma, start, end);
+               radix__flush_tlb_range(vma, start, end);
 }
 
 static inline void flush_tlb_kernel_range(unsigned long start,
                                          unsigned long end)
 {
        if (radix_enabled())
-               return radix__flush_tlb_kernel_range(start, end);
-       return hash__flush_tlb_kernel_range(start, end);
+               radix__flush_tlb_kernel_range(start, end);
 }
 
 static inline void local_flush_tlb_mm(struct mm_struct *mm)
 {
        if (radix_enabled())
-               return radix__local_flush_tlb_mm(mm);
-       return hash__local_flush_tlb_mm(mm);
+               radix__local_flush_tlb_mm(mm);
 }
 
 static inline void local_flush_tlb_page(struct vm_area_struct *vma,
                                        unsigned long vmaddr)
 {
        if (radix_enabled())
-               return radix__local_flush_tlb_page(vma, vmaddr);
-       return hash__local_flush_tlb_page(vma, vmaddr);
+               radix__local_flush_tlb_page(vma, vmaddr);
 }
 
-static inline void local_flush_all_mm(struct mm_struct *mm)
+static inline void local_flush_tlb_page_psize(struct mm_struct *mm,
+                                             unsigned long vmaddr, int psize)
 {
        if (radix_enabled())
-               return radix__local_flush_all_mm(mm);
-       return hash__local_flush_all_mm(mm);
+               radix__local_flush_tlb_page_psize(mm, vmaddr, psize);
 }
 
 static inline void tlb_flush(struct mmu_gather *tlb)
 {
        if (radix_enabled())
-               return radix__tlb_flush(tlb);
-       return hash__tlb_flush(tlb);
+               radix__tlb_flush(tlb);
 }
 
 #ifdef CONFIG_SMP
 static inline void flush_tlb_mm(struct mm_struct *mm)
 {
        if (radix_enabled())
-               return radix__flush_tlb_mm(mm);
-       return hash__flush_tlb_mm(mm);
+               radix__flush_tlb_mm(mm);
 }
 
 static inline void flush_tlb_page(struct vm_area_struct *vma,
                                  unsigned long vmaddr)
 {
        if (radix_enabled())
-               return radix__flush_tlb_page(vma, vmaddr);
-       return hash__flush_tlb_page(vma, vmaddr);
-}
-
-static inline void flush_all_mm(struct mm_struct *mm)
-{
-       if (radix_enabled())
-               return radix__flush_all_mm(mm);
-       return hash__flush_all_mm(mm);
+               radix__flush_tlb_page(vma, vmaddr);
 }
 #else
 #define flush_tlb_mm(mm)               local_flush_tlb_mm(mm)
 #define flush_tlb_page(vma, addr)      local_flush_tlb_page(vma, addr)
-#define flush_all_mm(mm)               local_flush_all_mm(mm)
 #endif /* CONFIG_SMP */
 
 #define flush_tlb_fix_spurious_fault flush_tlb_fix_spurious_fault