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

Commit e4886664 authored by Vitaly Andrianov's avatar Vitaly Andrianov Committed by Russell King
Browse files

ARM: 8396/1: use phys_addr_t in pfn_to_kaddr() 



This patch fixes pfn_to_kaddr() to use phys_addr_t.  Without this,
this macro is broken on LPAE systems. For physical addresses above
first 4GB result of shifting pfn with PAGE_SHIFT may be truncated.

Signed-off-by: default avatarVitaly Andrianov <vitalya@ti.com>
Acked-by: default avatarNicolas Pitre <nico@linaro.org>
Acked-by: default avatarSantosh Shilimkar <ssantosh@kernel.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 3de1f52a

arch/arm/include/asm/memory.h

+1 −1
Original line number Diff line number Diff line
@@ -291,7 +291,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 pfn_to_kaddr(pfn)	__va((phys_addr_t)(pfn) << PAGE_SHIFT)



extern phys_addr_t (*arch_virt_to_idmap)(unsigned long x);