Skip to content

Commit faf7993

Browse files
author
Vasily Gorbik
committed
s390/alternatives: avoid using jgnop mnemonic
jgnop mnemonic is only available since binutils 2.36, kernel minimal required version is 2.23. Stick to brcl to avoid build errors. Reported-by: Nathan Chancellor <nathan@kernel.org> Fixes: 4afeb67 ("s390/alternatives: use instructions instead of byte patterns") Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
1 parent 7dcfe50 commit faf7993

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

arch/s390/include/asm/alternative-asm.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
*/
3939
.macro alt_pad_fill bytes
4040
.rept ( \bytes ) / 6
41-
jgnop .
41+
brcl 0,0
4242
.endr
4343
.rept ( \bytes ) % 6 / 4
4444
nop

arch/s390/include/asm/alternative.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ void apply_alternatives(struct alt_instr *start, struct alt_instr *end);
7575
"\tnopr\n" \
7676
".else\n" \
7777
"\t.rept " oldinstr_pad_len(num) " / 6\n" \
78-
"\t.jgnop .\n" \
78+
"\t.brcl 0,0\n" \
7979
"\t.endr\n" \
8080
"\t.rept " oldinstr_pad_len(num) " %% 6 / 4\n" \
8181
"\tnop\n" \

0 commit comments

Comments
 (0)