diff options
| author | Vasily Gorbik <gor@linux.ibm.com> | 2022-03-28 23:27:54 +0200 |
|---|---|---|
| committer | Vasily Gorbik <gor@linux.ibm.com> | 2022-03-28 23:27:54 +0200 |
| commit | faf79934e65aff90284725518a5ec3c2241c65ae (patch) | |
| tree | 45295476a499556af0ff956c63c76ce68916a5c7 /arch/s390 | |
| parent | 7dcfe50f58d28e0e2ba79e9e4333888bcf9442a4 (diff) | |
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: 4afeb670710e ("s390/alternatives: use instructions instead of byte patterns")
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/include/asm/alternative-asm.h | 2 | ||||
| -rw-r--r-- | 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 221d790361b9..bb3837d7387c 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 6c72495c8dbb..3f2856ed6808 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" \ |