Messages in this thread | | | Date | Tue, 24 Jul 2012 11:37:17 +0100 | From | Catalin Marinas <> | Subject | Re: [RFC 03/23] ARM: LPAE: use phys_addr_t on virt <--> phys conversion |
| |
On Tue, Jul 24, 2012 at 02:09:05AM +0100, 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 <vitalya@ti.com> > Signed-off-by: Cyril Chemparathy <cyril@ti.com> > --- > 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 fcb5757..7629dfe 100644 > --- a/arch/arm/include/asm/memory.h > +++ b/arch/arm/include/asm/memory.h > @@ -169,22 +169,27 @@ 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; > }
BTW, I would prefer if the phys-to-virt patching was fixed as well. It shouldn't be difficult.
-- Catalin
| |