From mboxrd@z Thu Jan 1 00:00:00 1970 From: catalin.marinas@arm.com (Catalin Marinas) Date: Fri, 15 Nov 2013 13:34:28 +0000 Subject: [PATCH 1/6] arm64: mm: Add __virt_to_idmap() to keep kvm build happy In-Reply-To: <1384457866-16135-2-git-send-email-santosh.shilimkar@ti.com> References: <1384457866-16135-1-git-send-email-santosh.shilimkar@ti.com> <1384457866-16135-2-git-send-email-santosh.shilimkar@ti.com> Message-ID: <20131115133428.GA1217@darko.cambridge.arm.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Thu, Nov 14, 2013 at 07:37:41PM +0000, Santosh Shilimkar wrote: > ARM kvm code will make use of __virt_to_idmap() on arm32 > machines as hardware interconnect supported alias of physical > memory for idmap purposes. The same code is shared with arm64 > bit and hence will break the builds. So we add __virt_to_idmap() > which is just __virt_to_phys() on arm64 bit to keep build happy. > > Cc: Catalin Marinas > Cc: Will Deacon > Cc: Marc Zyngier > Cc: Christoffer Dall > > Signed-off-by: Santosh Shilimkar BTW, there is normally no space between the Cc and Signed-off-by lines. > --- > arch/arm64/include/asm/memory.h | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h > index 3776217..d9341ee 100644 > --- a/arch/arm64/include/asm/memory.h > +++ b/arch/arm64/include/asm/memory.h > @@ -75,6 +75,14 @@ > #define __phys_to_virt(x) ((unsigned long)((x) - PHYS_OFFSET + PAGE_OFFSET)) > > /* > + * Added to keep arm64 kvm build working which shares code with > + * 32bit port. ARM kvm code makes use of __virt_to_idmap() on arm32 > + * machines as hardware interconnect supported alias of physical > + * memory for idmap purposes. > + */ > +#define virt_to_idmap(x) __virt_to_phys(x) There are consistency issues with the use of underscores before __virt_to_idmap. And I think you can simply say something like "Required by ARM KVM code". The explanation on why really belongs to the 32-bit arm code. -- Catalin