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

Commit 9ba33dcc authored by Will Deacon's avatar Will Deacon
Browse files

arm64: memory: Simplify virt_to_page() implementation 



Build virt_to_page() on top of virt_to_pfn() so we can avoid the need
for explicit shifting.

Tested-by: default avatarSteve Capper <steve.capper@arm.com>
Reviewed-by: default avatarSteve Capper <steve.capper@arm.com>
Tested-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Reviewed-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 96628f0f

arch/arm64/include/asm/memory.h

+1 −1
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ static inline void *phys_to_virt(phys_addr_t x) 
#define ARCH_PFN_OFFSET		((unsigned long)PHYS_PFN_OFFSET)



#if !defined(CONFIG_SPARSEMEM_VMEMMAP) || defined(CONFIG_DEBUG_VIRTUAL)

#define virt_to_page(kaddr)	pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)

#define virt_to_page(kaddr)	pfn_to_page(virt_to_pfn(kaddr))

#else

#define page_to_virt(x)	({						\

	__typeof__(x) __page = x;					\