From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 4 Apr 2022 21:38:28 +0000 (+0200)
Subject: ARM: PXA: fix multi-cpu build of xsc3
X-Git-Tag: v6.6.17~7360^2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c8a91428941b912d66e13a2719fe6ac670150d69;p=platform%2Fkernel%2Flinux-rpi.git

ARM: PXA: fix multi-cpu build of xsc3

On a kernel that includes both ARMv4 and XScale support,
the copypage function fails to build with invalid
instructions.

Since these are only called on an actual XScale processor,
annotate the assembly with the correct .arch directive.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

diff --git a/arch/arm/mm/copypage-xsc3.c b/arch/arm/mm/copypage-xsc3.c
index 6f0909d..c86e796 100644
--- a/arch/arm/mm/copypage-xsc3.c
+++ b/arch/arm/mm/copypage-xsc3.c
@@ -29,6 +29,7 @@ static void xsc3_mc_copy_user_page(void *kto, const void *kfrom)
 	int tmp;
 
 	asm volatile ("\
+.arch xscale					\n\
 	pld	[%1, #0]			\n\
 	pld	[%1, #32]			\n\
 1:	pld	[%1, #64]			\n\
@@ -80,6 +81,7 @@ void xsc3_mc_clear_user_highpage(struct page *page, unsigned long vaddr)
 {
 	void *ptr, *kaddr = kmap_atomic(page);
 	asm volatile ("\
+.arch xscale					\n\
 	mov	r1, %2				\n\
 	mov	r2, #0				\n\
 	mov	r3, #0				\n\