3 files changed, 9 insertions, 4 deletions

diff --git a/arch/powerpc/include/asm/hugetlb.h b/arch/powerpc/include/asm/hugetlb.h
index 555044c310b2..863f49d5ea35 100644
--- a/arch/powerpc/include/asm/hugetlb.h
+++ b/arch/powerpc/include/asm/hugetlb.h
@@ -52,7 +52,8 @@ static inline int is_hugepage_only_range(struct mm_struct *mm,
 }
 #endif
 
-void book3e_hugetlb_preload(struct mm_struct *mm, unsigned long ea, pte_t pte);
+void book3e_hugetlb_preload(struct vm_area_struct *vma, unsigned long ea,
+                            pte_t pte);
 void flush_hugetlb_page(struct vm_area_struct *vma, unsigned long vmaddr);
 
 void hugetlb_free_pgd_range(struct mmu_gather *tlb, unsigned long addr,
diff --git a/arch/powerpc/mm/hugetlbpage-book3e.c b/arch/powerpc/mm/hugetlbpage-book3e.c
index 4d6d849a3e54..3bc700655fc8 100644
--- a/arch/powerpc/mm/hugetlbpage-book3e.c
+++ b/arch/powerpc/mm/hugetlbpage-book3e.c
@@ -37,12 +37,14 @@ static inline int book3e_tlb_exists(unsigned long ea, unsigned long pid)
         return found;
 }
 
-void book3e_hugetlb_preload(struct mm_struct *mm, unsigned long ea, pte_t pte)
+void book3e_hugetlb_preload(struct vm_area_struct *vma, unsigned long ea,
+                            pte_t pte)
 {
         unsigned long mas1, mas2;
         u64 mas7_3;
         unsigned long psize, tsize, shift;
         unsigned long flags;
+        struct mm_struct *mm;
 
 #ifdef CONFIG_PPC_FSL_BOOK3E
         int index, ncams;
@@ -51,12 +53,14 @@ void book3e_hugetlb_preload(struct mm_struct *mm, unsigned long ea, pte_t pte)
         if (unlikely(is_kernel_addr(ea)))
                 return;
 
+        mm = vma->vm_mm;
+
 #ifdef CONFIG_PPC_MM_SLICES
         psize = get_slice_psize(mm, ea);
         tsize = mmu_get_tsize(psize);
         shift = mmu_psize_defs[psize].shift;
 #else
-        psize = vma_mmu_pagesize(find_vma(mm, ea));
+        psize = vma_mmu_pagesize(vma);
         shift = __ilog2(psize);
         tsize = shift - 10;
 #endif
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index 22563b9664c3..83d819f30864 100644
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -553,7 +553,7 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long address,
 #if (defined(CONFIG_PPC_BOOK3E_64) || defined(CONFIG_PPC_FSL_BOOK3E)) \
         && defined(CONFIG_HUGETLB_PAGE)
         if (is_vm_hugetlb_page(vma))
-                book3e_hugetlb_preload(vma->vm_mm, address, *ptep);
+                book3e_hugetlb_preload(vma, address, *ptep);
 #endif
 }