arm64/hugetlb: Use macros for contiguous huge page sizes

Replace all open encoded contiguous huge page size computations with
available macro encodings CONT_PTE_SIZE and CONT_PMD_SIZE. There are other
instances where these macros are used in the file and this change makes it
consistently use the same mnemonic.

Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Steve Capper <steve.capper@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c
index f475e54fbc431a392764c69379505a5f3bcdf9b8..bbeb6a5a6ba6dea94c69e85413ec94534bd3985f 100644 (file)
--- a/arch/arm64/mm/hugetlbpage.c
+++ b/arch/arm64/mm/hugetlbpage.c
@@ -228,7 +228,7 @@ pte_t *huge_pte_alloc(struct mm_struct *mm,
 
        if (sz == PUD_SIZE) {
                ptep = (pte_t *)pudp;
-       } else if (sz == (PAGE_SIZE * CONT_PTES)) {
+       } else if (sz == (CONT_PTE_SIZE)) {
                pmdp = pmd_alloc(mm, pudp, addr);
 
                WARN_ON(addr & (sz - 1));
@@ -246,7 +246,7 @@ pte_t *huge_pte_alloc(struct mm_struct *mm,
                        ptep = huge_pmd_share(mm, addr, pudp);
                else
                        ptep = (pte_t *)pmd_alloc(mm, pudp, addr);
-       } else if (sz == (PMD_SIZE * CONT_PMDS)) {
+       } else if (sz == (CONT_PMD_SIZE)) {
                pmdp = pmd_alloc(mm, pudp, addr);
                WARN_ON(addr & (sz - 1));
                return (pte_t *)pmdp;
@@ -454,9 +454,9 @@ static int __init hugetlbpage_init(void)
 #ifdef CONFIG_ARM64_4K_PAGES
        add_huge_page_size(PUD_SIZE);
 #endif
-       add_huge_page_size(PMD_SIZE * CONT_PMDS);
+       add_huge_page_size(CONT_PMD_SIZE);
        add_huge_page_size(PMD_SIZE);
-       add_huge_page_size(PAGE_SIZE * CONT_PTES);
+       add_huge_page_size(CONT_PTE_SIZE);
 
        return 0;
 }
@@ -470,9 +470,9 @@ static __init int setup_hugepagesz(char *opt)
 #ifdef CONFIG_ARM64_4K_PAGES
        case PUD_SIZE:
 #endif
-       case PMD_SIZE * CONT_PMDS:
+       case CONT_PMD_SIZE:
        case PMD_SIZE:
-       case PAGE_SIZE * CONT_PTES:
+       case CONT_PTE_SIZE:
                add_huge_page_size(ps);
                return 1;
        }