Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40f87d31 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Catalin Marinas
Browse files

arm64: mm: fold init_pgd() into __create_pgd_mapping() 



The routine __create_pgd_mapping() does nothing except calling init_pgd(),
which has no other callers. So fold the latter into the former. Also, drop
a comment that has gone stale.

Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 4133af6c

arch/arm64/mm/mmu.c

+6 −18
Original line number Diff line number Diff line
@@ -239,16 +239,14 @@ static void alloc_init_pud(pgd_t *pgd, unsigned long addr, unsigned long end, 
	pud_clear_fixmap();

}



/*

 * Create the page directory entries and any necessary page tables for the

 * mapping specified by 'md'.

 */

static void init_pgd(pgd_t *pgd, phys_addr_t phys, unsigned long virt,

				    phys_addr_t size, pgprot_t prot,

static void __create_pgd_mapping(pgd_t *pgdir, phys_addr_t phys,

				 unsigned long virt, phys_addr_t size,

				 pgprot_t prot,

				 phys_addr_t (*pgtable_alloc)(void),

				 bool allow_block_mappings)

{

	unsigned long addr, length, end, next;

	pgd_t *pgd = pgd_offset_raw(pgdir, virt);



	/*

	 * If the virtual and physical address don't have the same offset
@@ -280,16 +278,6 @@ static phys_addr_t late_pgtable_alloc(void) 
	return __pa(ptr);

}



static void __create_pgd_mapping(pgd_t *pgdir, phys_addr_t phys,

				 unsigned long virt, phys_addr_t size,

				 pgprot_t prot,

				 phys_addr_t (*alloc)(void),

				 bool allow_block_mappings)

{

	init_pgd(pgd_offset_raw(pgdir, virt), phys, virt, size, prot, alloc,

		 allow_block_mappings);

}



/*

 * This function can only be used to modify existing table entries,

 * without allocating new levels of table. Note that this permits the