--- v8
+++ v10
@@ -43,10 +43,10 @@
  
  #endif /* _ASM_POWERPC_VMALLOC_H */
 diff --git a/arch/powerpc/mm/book3s64/radix_pgtable.c b/arch/powerpc/mm/book3s64/radix_pgtable.c
-index ab426fc0cd4b..de6b558dc187 100644
+index 743807fc210f..8da62afccee5 100644
 --- a/arch/powerpc/mm/book3s64/radix_pgtable.c
 +++ b/arch/powerpc/mm/book3s64/radix_pgtable.c
-@@ -1121,22 +1121,6 @@ void radix__ptep_modify_prot_commit(struct vm_area_struct *vma,
+@@ -1082,22 +1082,6 @@ void radix__ptep_modify_prot_commit(struct vm_area_struct *vma,
  	set_pte_at(mm, addr, ptep, pte);
  }
  
@@ -69,7 +69,7 @@
  int pud_set_huge(pud_t *pud, phys_addr_t addr, pgprot_t prot)
  {
  	pte_t *ptep = (pte_t *)pud;
-@@ -1220,8 +1204,3 @@ int pmd_free_pte_page(pmd_t *pmd, unsigned long addr)
+@@ -1181,8 +1165,3 @@ int pmd_free_pte_page(pmd_t *pmd, unsigned long addr)
  
  	return 1;
  }