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

Commit ca5a45c0 authored by Santosh Shilimkar's avatar Santosh Shilimkar
Browse files

ARM: mm: use phys_addr_t appropriately in p2v and v2p conversions 



Fix remainder types used when converting back and forth between
physical and virtual addresses.

Cc: Russell King <linux@arm.linux.org.uk>

Acked-by: default avatarNicolas Pitre <nico@linaro.org>
Signed-off-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
parent 4a10c2ac

arch/arm/include/asm/memory.h

+16 −6
Original line number Diff line number Diff line
@@ -185,22 +185,32 @@ extern unsigned long __pv_phys_offset; 
	: "=r" (to)					\

	: "r" (from), "I" (type))



static inline unsigned long __virt_to_phys(unsigned long x)

static inline phys_addr_t __virt_to_phys(unsigned long x)

{

	unsigned long t;

	__pv_stub(x, t, "add", __PV_BITS_31_24);

	return t;

}



static inline unsigned long __phys_to_virt(unsigned long x)

static inline unsigned long __phys_to_virt(phys_addr_t x)

{

	unsigned long t;

	__pv_stub(x, t, "sub", __PV_BITS_31_24);

	return t;

}



#else

#define __virt_to_phys(x)	((x) - PAGE_OFFSET + PHYS_OFFSET)

#define __phys_to_virt(x)	((x) - PHYS_OFFSET + PAGE_OFFSET)



static inline phys_addr_t __virt_to_phys(unsigned long x)

{

	return (phys_addr_t)x - PAGE_OFFSET + PHYS_OFFSET;

}



static inline unsigned long __phys_to_virt(phys_addr_t x)

{

	return x - PHYS_OFFSET + PAGE_OFFSET;

}



#endif

#endif

#endif /* __ASSEMBLY__ */
@@ -238,14 +248,14 @@ static inline phys_addr_t virt_to_phys(const volatile void *x) 


static inline void *phys_to_virt(phys_addr_t x)

{

	return (void *)(__phys_to_virt((unsigned long)(x)));

	return (void *)__phys_to_virt(x);

}



/*

 * Drivers should NOT use these either.

 */

#define __pa(x)			__virt_to_phys((unsigned long)(x))

#define __va(x)			((void *)__phys_to_virt((unsigned long)(x)))

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

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



/*