From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 9 Apr 2015 11:59:35 +0000 (+0100)
Subject: ARM: allow 16-bit instructions in ALT_UP()
X-Git-Tag: v5.15~15874^2~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=89c6bc5884e52ec004f03071f268ba3f27003aba;p=platform%2Fkernel%2Flinux-starfive.git

ARM: allow 16-bit instructions in ALT_UP()

Allow ALT_UP() to cope with a 16-bit Thumb instruction by automatically
inserting a following nop instruction.  This allows us to care less
about getting the assembler to emit a 32-bit thumb instruction.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h
index f67fd3a..186270b 100644
--- a/arch/arm/include/asm/assembler.h
+++ b/arch/arm/include/asm/assembler.h
@@ -237,6 +237,9 @@
 	.pushsection ".alt.smp.init", "a"			;\
 	.long	9998b						;\
 9997:	instr							;\
+	.if . - 9997b == 2					;\
+		nop						;\
+	.endif							;\
 	.if . - 9997b != 4					;\
 		.error "ALT_UP() content must assemble to exactly 4 bytes";\
 	.endif							;\