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

Commit 869dcfd1 authored by Laura Abbott's avatar Laura Abbott Committed by Will Deacon
Browse files

arm64: Add cast for virt_to_pfn 



virt_to_pfn lacks a cast at the top level. Don't rely on __virt_to_phys
and explicitly cast to unsigned long.

Reviewed-by: default avatarMark Rutland <mark.rutland@arm.com>
Tested-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarLaura Abbott <labbott@redhat.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 9e22eb61

arch/arm64/include/asm/memory.h

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

#define __va(x)			((void *)__phys_to_virt((phys_addr_t)(x)))

#define pfn_to_kaddr(pfn)	__va((pfn) << PAGE_SHIFT)

#define virt_to_pfn(x)      __phys_to_pfn(__virt_to_phys(x))

#define virt_to_pfn(x)      __phys_to_pfn(__virt_to_phys((unsigned long)(x)))



/*

 *  virt_to_page(k)	convert a _valid_ virtual address to struct page *