1 files changed, 5 insertions, 9 deletions

diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c
index e5ae8663f230..3645f29bd814 100644
--- a/arch/arm64/mm/mmu.c
+++ b/arch/arm64/mm/mmu.c
@@ -765,7 +765,7 @@ int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node,
 
         return 0;
 }
-#endif  /* CONFIG_ARM64_64K_PAGES */
+#endif  /* !ARM64_SWAPPER_USES_SECTION_MAPS */
 void vmemmap_free(unsigned long start, unsigned long end,
                 struct vmem_altmap *altmap)
 {
@@ -960,32 +960,28 @@ int __init arch_ioremap_pmd_supported(void)
 
 int pud_set_huge(pud_t *pudp, phys_addr_t phys, pgprot_t prot)
 {
-        pgprot_t sect_prot = __pgprot(PUD_TYPE_SECT |
-                                        pgprot_val(mk_sect_prot(prot)));
-        pud_t new_pud = pfn_pud(__phys_to_pfn(phys), sect_prot);
+        pud_t new_pud = pfn_pud(__phys_to_pfn(phys), mk_pud_sect_prot(prot));
 
         /* Only allow permission changes for now */
         if (!pgattr_change_is_safe(READ_ONCE(pud_val(*pudp)),
                                    pud_val(new_pud)))
                 return 0;
 
-        BUG_ON(phys & ~PUD_MASK);
+        VM_BUG_ON(phys & ~PUD_MASK);
         set_pud(pudp, new_pud);
         return 1;
 }
 
 int pmd_set_huge(pmd_t *pmdp, phys_addr_t phys, pgprot_t prot)
 {
-        pgprot_t sect_prot = __pgprot(PMD_TYPE_SECT |
-                                        pgprot_val(mk_sect_prot(prot)));
-        pmd_t new_pmd = pfn_pmd(__phys_to_pfn(phys), sect_prot);
+        pmd_t new_pmd = pfn_pmd(__phys_to_pfn(phys), mk_pmd_sect_prot(prot));
 
         /* Only allow permission changes for now */
         if (!pgattr_change_is_safe(READ_ONCE(pmd_val(*pmdp)),
                                    pmd_val(new_pmd)))
                 return 0;
 
-        BUG_ON(phys & ~PMD_MASK);
+        VM_BUG_ON(phys & ~PMD_MASK);
         set_pmd(pmdp, new_pmd);
         return 1;
 }