Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753727Ab2HDGYJ (ORCPT ); Sat, 4 Aug 2012 02:24:09 -0400 Received: from mail-qa0-f46.google.com ([209.85.216.46]:63578 "EHLO mail-qa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752822Ab2HDGYF (ORCPT ); Sat, 4 Aug 2012 02:24:05 -0400 Date: Sat, 4 Aug 2012 02:24:02 -0400 (EDT) From: Nicolas Pitre To: Cyril Chemparathy cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, arnd@arndb.de, catalin.marinas@arm.com, linux@arm.linux.org.uk, will.deacon@arm.com, Vitaly Andrianov Subject: Re: [PATCH 03/22] ARM: LPAE: use phys_addr_t on virt <--> phys conversion In-Reply-To: <1343775898-28345-4-git-send-email-cyril@ti.com> Message-ID: References: <1343775898-28345-1-git-send-email-cyril@ti.com> <1343775898-28345-4-git-send-email-cyril@ti.com> User-Agent: Alpine 2.02 (LFD 1266 2009-07-14) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2471 Lines: 79 On Tue, 31 Jul 2012, Cyril Chemparathy wrote: > This patch fixes up the types used when converting back and forth between > physical and virtual addresses. > > Signed-off-by: Vitaly Andrianov > Signed-off-by: Cyril Chemparathy Did you verify that this didn't introduce any compilation warning when compiling for non LPAE? If so and there were no warnings then... Acked-by: Nicolas Pitre > --- > arch/arm/include/asm/memory.h | 17 +++++++++++------ > 1 file changed, 11 insertions(+), 6 deletions(-) > > diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h > index 01c710d..4a0108f 100644 > --- a/arch/arm/include/asm/memory.h > +++ b/arch/arm/include/asm/memory.h > @@ -157,22 +157,27 @@ extern unsigned long __pv_phys_offset; > > extern unsigned long __pv_offset; > > -static inline unsigned long __virt_to_phys(unsigned long x) > +static inline phys_addr_t __virt_to_phys(unsigned long x) > { > unsigned long t; > early_patch_imm8(x, t, "add", __pv_offset); > 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; > early_patch_imm8(x, t, "sub", __pv_offset); > 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) \ > + ((phys_addr_t)(x) - PAGE_OFFSET + PHYS_OFFSET) > + > +#define __phys_to_virt(x) \ > + ((unsigned long)((phys_addr_t)(x) - PHYS_OFFSET + PAGE_OFFSET)) > + > #endif > #endif > > @@ -207,14 +212,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) > > /* > -- > 1.7.9.5 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/