diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2019-11-03 21:35:58 +0900 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2019-11-06 11:17:09 +0000 |
| commit | 32d1870877ba7675c642e903e5ef71c82a245325 (patch) | |
| tree | a83ade295c7903cc9b081440874dc27a8599e2fb /arch/arm64/mm/mmu.c | |
| parent | e44ec4a35dbdf3f3fe772f176fab3b8be7e02b0f (diff) | |
| download | lwn-32d1870877ba7675c642e903e5ef71c82a245325.tar.gz lwn-32d1870877ba7675c642e903e5ef71c82a245325.zip | |
arm64: mm: simplify the page end calculation in __create_pgd_mapping()
Calculate the page-aligned end address more simply.
The local variable, "length" is unneeded.
Reviewed-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm64/mm/mmu.c')
| -rw-r--r-- | arch/arm64/mm/mmu.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index 60c929f3683b..a9f541912289 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -338,7 +338,7 @@ static void __create_pgd_mapping(pgd_t *pgdir, phys_addr_t phys, phys_addr_t (*pgtable_alloc)(int), int flags) { - unsigned long addr, length, end, next; + unsigned long addr, end, next; pgd_t *pgdp = pgd_offset_raw(pgdir, virt); /* @@ -350,9 +350,8 @@ static void __create_pgd_mapping(pgd_t *pgdir, phys_addr_t phys, phys &= PAGE_MASK; addr = virt & PAGE_MASK; - length = PAGE_ALIGN(size + (virt & ~PAGE_MASK)); + end = PAGE_ALIGN(virt + size); - end = addr + length; do { next = pgd_addr_end(addr, end); alloc_init_pud(pgdp, addr, next, phys, prot, pgtable_alloc, |