From mboxrd@z Thu Jan 1 00:00:00 1970 From: pavel@ucw.cz (Pavel Machek) Date: Sat, 14 Nov 2015 22:25:15 +0100 Subject: [PATCH v2 02/11] arm64: Fold proc-macros.S into assembler.h In-Reply-To: <1445966960-31724-3-git-send-email-james.morse@arm.com> References: <1445966960-31724-1-git-send-email-james.morse@arm.com> <1445966960-31724-3-git-send-email-james.morse@arm.com> Message-ID: <20151114212515.GF20429@amd> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Tue 2015-10-27 17:29:11, James Morse wrote: > From: Geoff Levand > > To allow the assembler macros defined in arch/arm64/mm/proc-macros.S to > be used outside the mm code move the contents of proc-macros.S to > asm/assembler.h. Also, delete proc-macros.S, and fix up all references > to proc-macros.S. > > Signed-off-by: Geoff Levand > Signed-off-by: James Morse > --- > arch/arm64/include/asm/assembler.h | 48 +++++++++++++++++++++++++++- > arch/arm64/kernel/head.S | 1 - > arch/arm64/kvm/hyp-init.S | 1 - > arch/arm64/mm/cache.S | 2 -- > arch/arm64/mm/proc-macros.S | 64 -------------------------------------- > arch/arm64/mm/proc.S | 3 -- > 6 files changed, 47 insertions(+), 72 deletions(-) > delete mode 100644 arch/arm64/mm/proc-macros.S > > diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h > index b51f2cc22ca9..91cb311d33de 100644 > --- a/arch/arm64/include/asm/assembler.h > +++ b/arch/arm64/include/asm/assembler.h > @@ -1,5 +1,5 @@ > /* > - * Based on arch/arm/include/asm/assembler.h > + * * Based on arch/arm/include/asm/assembler.h, arch/arm/mm/proc-macros.S Why the two stars? Otherwise looks ok. -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html