[PATCH v5 03/19] ARM: LPAE: Use unsigned long for __phys_to_virt and __virt_to_phys
From: Russell King - ARM Linux <hidden>
Date: 2011-05-08 21:44:56
Also in:
lkml
On Sun, May 08, 2011 at 01:51:22PM +0100, Catalin Marinas wrote:
The !CONFIG_ARM_PATCH_PHYS_VIRT case uses macros for __phys_to_virt and __virt_to_phys but does not use any type casting. This causes issues
It might be a good idea to include the compiler warning message in the commit log, so that the 'issues' being addressed are readily known.
quoted hunk ↗ jump to hunk
with LPAE where the phys_addr_t is 64-bit. Note that these macros are only valid for lowmem physical addresses where the range is within 32-bit. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> --- arch/arm/include/asm/memory.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h index 431077c..10e4b4c 100644 --- a/arch/arm/include/asm/memory.h +++ b/arch/arm/include/asm/memory.h@@ -194,8 +194,8 @@ static inline unsigned long __phys_to_virt(unsigned long x) return t; } #else -#define __virt_to_phys(x) ((x) - PAGE_OFFSET + PHYS_OFFSET) -#define __phys_to_virt(x) ((x) - PHYS_OFFSET + PAGE_OFFSET) +#define __virt_to_phys(x) ((unsigned long)(x) - PAGE_OFFSET + PHYS_OFFSET) +#define __phys_to_virt(x) ((unsigned long)(x) - PHYS_OFFSET + PAGE_OFFSET) #endif #endif