diff options
| author | Cyril Chemparathy <cyril@ti.com> | 2012-09-20 12:47:46 -0400 |
|---|---|---|
| committer | Cyril Chemparathy <cyril@ti.com> | 2012-09-21 10:44:21 -0400 |
| commit | 88a078ec098b41f8fba00c853f77311c6b41a3ed (patch) | |
| tree | 70a6c95ab938aea79e27afb523d7cb685d8582fa | |
| parent | 84a5c77765c556496707300f20d537949f37d234 (diff) | |
| download | linux-keystone-88a078ec098b41f8fba00c853f77311c6b41a3ed.tar.gz | |
ARM: 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.
| -rw-r--r-- | arch/arm/include/asm/memory.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h index f043da5279f1dd..736a8aa32fd760 100644 --- a/arch/arm/include/asm/memory.h +++ b/arch/arm/include/asm/memory.h @@ -277,7 +277,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) /* * These are for systems that have a hardware interconnect supported alias of |