From faf79934e65aff90284725518a5ec3c2241c65ae Mon Sep 17 00:00:00 2001 From: Vasily Gorbik Date: Mon, 28 Mar 2022 23:27:54 +0200 Subject: [PATCH] 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 Fixes: 4afeb670710e ("s390/alternatives: use instructions instead of byte patterns") Signed-off-by: Vasily Gorbik --- arch/s390/include/asm/alternative-asm.h | 2 +- arch/s390/include/asm/alternative.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/s390/include/asm/alternative-asm.h b/arch/s390/include/asm/alternative-asm.h index 221d790..bb3837d 100644 --- a/arch/s390/include/asm/alternative-asm.h +++ b/arch/s390/include/asm/alternative-asm.h @@ -38,7 +38,7 @@ */ .macro alt_pad_fill bytes .rept ( \bytes ) / 6 - jgnop . + brcl 0,0 .endr .rept ( \bytes ) % 6 / 4 nop diff --git a/arch/s390/include/asm/alternative.h b/arch/s390/include/asm/alternative.h index 6c72495..3f2856e 100644 --- a/arch/s390/include/asm/alternative.h +++ b/arch/s390/include/asm/alternative.h @@ -75,7 +75,7 @@ void apply_alternatives(struct alt_instr *start, struct alt_instr *end); "\tnopr\n" \ ".else\n" \ "\t.rept " oldinstr_pad_len(num) " / 6\n" \ - "\t.jgnop .\n" \ + "\t.brcl 0,0\n" \ "\t.endr\n" \ "\t.rept " oldinstr_pad_len(num) " %% 6 / 4\n" \ "\tnop\n" \ -- 2.7.4