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

Commit 3a6b1676 authored by Will Deacon's avatar Will Deacon Committed by Russell King
Browse files

ARM: 6675/1: use phys_addr_t instead of unsigned long in conversion code 



The unsigned long datatype is not sufficient for mapping physical addresses
>= 4GB.

This patch ensures that the address conversion code in asm/memory.h casts
to the correct type when handling physical addresses. The internal v2p
macros only deal with lowmem addresses, so these do not need to be modified.

Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 4d901c42

arch/arm/include/asm/memory.h

+5 −4
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 


#include <linux/compiler.h>

#include <linux/const.h>

#include <linux/types.h>

#include <mach/memory.h>

#include <asm/sizes.h>
@@ -135,8 +136,8 @@ 
/*

 * Convert a physical address to a Page Frame Number and back

 */

#define	__phys_to_pfn(paddr)	((paddr) >> PAGE_SHIFT)

#define	__pfn_to_phys(pfn)	((pfn) << PAGE_SHIFT)

#define	__phys_to_pfn(paddr)	((unsigned long)((paddr) >> PAGE_SHIFT))

#define	__pfn_to_phys(pfn)	((phys_addr_t)(pfn) << PAGE_SHIFT)



/*

 * Convert a page to/from a physical address
@@ -234,12 +235,12 @@ static inline unsigned long __phys_to_virt(unsigned long x) 
 * translation for translating DMA addresses.  Use the driver

 * DMA support - see dma-mapping.h.

 */

static inline unsigned long virt_to_phys(const volatile void *x)

static inline phys_addr_t virt_to_phys(const volatile void *x)

{

	return __virt_to_phys((unsigned long)(x));

}



static inline void *phys_to_virt(unsigned long x)

static inline void *phys_to_virt(phys_addr_t x)

{

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

}