kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
This commit is contained in:
Ard Biesheuvel 2016-06-29 14:51:30 +02:00 committed by Catalin Marinas
parent 4133af6c04
commit 40f87d3114
1 changed files with 6 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
arch/arm64/mm/mmu.c
View file

@ -239,16 +239,14 @@ static void alloc_init_pud(pgd_t *pgd, unsigned long addr, unsigned long end,
pud_clear_fixmap(); pud_clear_fixmap();
} }
/* static void __create_pgd_mapping(pgd_t *pgdir, phys_addr_t phys,
* Create the page directory entries and any necessary page tables for the unsigned long virt, phys_addr_t size,
* mapping specified by 'md'. pgprot_t prot,
*/ phys_addr_t (*pgtable_alloc)(void),
static void init_pgd(pgd_t *pgd, phys_addr_t phys, unsigned long virt, bool allow_block_mappings)
phys_addr_t size, pgprot_t prot,
phys_addr_t (*pgtable_alloc)(void),
bool allow_block_mappings)
{ {
unsigned long addr, length, end, next; 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 * 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); 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, * This function can only be used to modify existing table entries,
* without allocating new levels of table. Note that this permits the * without allocating new levels of table. Note that this permits the