--- v9
+++ v11
@@ -46,10 +46,10 @@
  
  #endif /* _ASM_ARM64_VMALLOC_H */
 diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c
-index 1b60079c1cef..0af5b5cfb9c6 100644
+index 1613d290cbd1..ab9ba7c36dae 100644
 --- a/arch/arm64/mm/mmu.c
 +++ b/arch/arm64/mm/mmu.c
-@@ -1315,27 +1315,6 @@ void *__init fixmap_remap_fdt(phys_addr_t dt_phys, int *size, pgprot_t prot)
+@@ -1313,27 +1313,6 @@ void *__init fixmap_remap_fdt(phys_addr_t dt_phys, int *size, pgprot_t prot)
  	return dt_virt;
  }
  
@@ -58,7 +58,7 @@
 -	return false;
 -}
 -
--bool arch_vmap_pud_supported(pgprot_t prot);
+-bool arch_vmap_pud_supported(pgprot_t prot)
 -{
 -	/*
 -	 * Only 4k granule supports level 1 block mappings.
@@ -77,7 +77,7 @@
  int pud_set_huge(pud_t *pudp, phys_addr_t phys, pgprot_t prot)
  {
  	pud_t new_pud = pfn_pud(__phys_to_pfn(phys), mk_pud_sect_prot(prot));
-@@ -1427,11 +1406,6 @@ int pud_free_pmd_page(pud_t *pudp, unsigned long addr)
+@@ -1425,11 +1404,6 @@ int pud_free_pmd_page(pud_t *pudp, unsigned long addr)
  	return 1;
  }