From: Eugeniy Paltsev Date: Wed, 11 Mar 2020 16:26:43 +0000 (+0300) Subject: ARC: define __ALIGN_STR and __ALIGN symbols for ARC X-Git-Tag: v5.6-rc6~10^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8d92e992a785f35d23f845206cf8c6cafbc264e0;p=thirdparty%2Fkernel%2Flinux.git ARC: define __ALIGN_STR and __ALIGN symbols for ARC The default defintions use fill pattern 0x90 for padding which for ARC generates unintended "ldh_s r12,[r0,0x20]" corresponding to opcode 0x9090 So use ".align 4" which insert a "nop_s" instruction instead. Cc: stable@vger.kernel.org Acked-by: Vineet Gupta Signed-off-by: Eugeniy Paltsev Signed-off-by: Vineet Gupta --- diff --git a/arch/arc/include/asm/linkage.h b/arch/arc/include/asm/linkage.h index d9ee43c6b7dbc..fe19f1d412e71 100644 --- a/arch/arc/include/asm/linkage.h +++ b/arch/arc/include/asm/linkage.h @@ -29,6 +29,8 @@ .endm #define ASM_NL ` /* use '`' to mark new line in macro */ +#define __ALIGN .align 4 +#define __ALIGN_STR __stringify(__ALIGN) /* annotation for data we want in DCCM - if enabled in .config */ .macro ARCFP_DATA nm