Skip to content

Commit 1b21445

Browse files
Linu Cherianctmarinas
authored andcommitted
arm64/mm: Rename try_pgd_pgtable_alloc_init_mm
With BUG_ON in pgd_pgtable_alloc_init_mm moved up to higher layer, gfp flags is the only difference between try_pgd_pgtable_alloc_init_mm and pgd_pgtable_alloc_init_mm. Hence rename the "try" version to pgd_pgtable_alloc_init_mm_gfp. Reviewed-by: Dev Jain <dev.jain@arm.com> Reviewed-by: Ryan Roberts <ryan.roberts@arm.com> Reviewed-by: Kevin Brodsky <kevin.brodsky@arm.com> Signed-off-by: Linu Cherian <linu.cherian@arm.com> Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
1 parent bfc184c commit 1b21445

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

arch/arm64/mm/mmu.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -560,15 +560,15 @@ static phys_addr_t __pgd_pgtable_alloc(struct mm_struct *mm, gfp_t gfp,
560560
}
561561

562562
static phys_addr_t
563-
try_pgd_pgtable_alloc_init_mm(enum pgtable_type pgtable_type, gfp_t gfp)
563+
pgd_pgtable_alloc_init_mm_gfp(enum pgtable_type pgtable_type, gfp_t gfp)
564564
{
565565
return __pgd_pgtable_alloc(&init_mm, gfp, pgtable_type);
566566
}
567567

568568
static phys_addr_t __maybe_unused
569569
pgd_pgtable_alloc_init_mm(enum pgtable_type pgtable_type)
570570
{
571-
return __pgd_pgtable_alloc(&init_mm, GFP_PGTABLE_KERNEL, pgtable_type);
571+
return pgd_pgtable_alloc_init_mm_gfp(pgtable_type, GFP_PGTABLE_KERNEL);
572572
}
573573

574574
static phys_addr_t
@@ -595,7 +595,7 @@ static int split_pmd(pmd_t *pmdp, pmd_t pmd, gfp_t gfp, bool to_cont)
595595
pte_t *ptep;
596596
int i;
597597

598-
pte_phys = try_pgd_pgtable_alloc_init_mm(TABLE_PTE, gfp);
598+
pte_phys = pgd_pgtable_alloc_init_mm_gfp(TABLE_PTE, gfp);
599599
if (pte_phys == INVALID_PHYS_ADDR)
600600
return -ENOMEM;
601601
ptep = (pte_t *)phys_to_virt(pte_phys);
@@ -640,7 +640,7 @@ static int split_pud(pud_t *pudp, pud_t pud, gfp_t gfp, bool to_cont)
640640
pmd_t *pmdp;
641641
int i;
642642

643-
pmd_phys = try_pgd_pgtable_alloc_init_mm(TABLE_PMD, gfp);
643+
pmd_phys = pgd_pgtable_alloc_init_mm_gfp(TABLE_PMD, gfp);
644644
if (pmd_phys == INVALID_PHYS_ADDR)
645645
return -ENOMEM;
646646
pmdp = (pmd_t *)phys_to_virt(pmd_phys);

0 commit comments

Comments
 (0)