hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Anshuman Khandual 2019-05-21 09:05:03 +05:30 committed by Catalin Marinas
parent f2c7c76c5d
commit 441a627806
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/arm64/mm/hugetlbpage.c
View File

@ -228,7 +228,7 @@ pte_t *huge_pte_alloc(struct mm_struct *mm,
if (sz == PUD_SIZE) { if (sz == PUD_SIZE) {
ptep = (pte_t *)pudp; ptep = (pte_t *)pudp;
} else if (sz == (PAGE_SIZE * CONT_PTES)) { } else if (sz == (CONT_PTE_SIZE)) {
pmdp = pmd_alloc(mm, pudp, addr); pmdp = pmd_alloc(mm, pudp, addr);
WARN_ON(addr & (sz - 1)); 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); ptep = huge_pmd_share(mm, addr, pudp);
else else
ptep = (pte_t *)pmd_alloc(mm, pudp, addr); 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); pmdp = pmd_alloc(mm, pudp, addr);
WARN_ON(addr & (sz - 1)); WARN_ON(addr & (sz - 1));
return (pte_t *)pmdp; return (pte_t *)pmdp;
@ -454,9 +454,9 @@ static int __init hugetlbpage_init(void)
#ifdef CONFIG_ARM64_4K_PAGES #ifdef CONFIG_ARM64_4K_PAGES
add_huge_page_size(PUD_SIZE); add_huge_page_size(PUD_SIZE);
#endif #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(PMD_SIZE);
add_huge_page_size(PAGE_SIZE * CONT_PTES); add_huge_page_size(CONT_PTE_SIZE);
return 0; return 0;
} }
@ -470,9 +470,9 @@ static __init int setup_hugepagesz(char *opt)
#ifdef CONFIG_ARM64_4K_PAGES #ifdef CONFIG_ARM64_4K_PAGES
case PUD_SIZE: case PUD_SIZE:
#endif #endif
case PMD_SIZE * CONT_PMDS: case CONT_PMD_SIZE:
case PMD_SIZE: case PMD_SIZE:
case PAGE_SIZE * CONT_PTES: case CONT_PTE_SIZE:
add_huge_page_size(ps); add_huge_page_size(ps);
return 1; return 1;
} }