Commit d0e47d38 authored Jan 10, 2017 by Laura Abbott Committed by Olav Haugan Aug 07, 2017

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.

Change-Id: I863f3c243e399a88b5813a794f1c677ca4f89c26
Reviewed-by: Mark Rutland <mark.rutland@arm.com>
Tested-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Laura Abbott <labbott@redhat.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Git-commit: 869dcfd10dfe59484cf14acddf264656d5ee94ea
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git


Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>

parent 1492b65a

arch/arm64/include/asm/memory.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -204,7 +204,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 *