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>

diff --git a/arch/s390/include/asm/alternative-asm.h b/arch/s390/include/asm/alternative-asm.h
index 221d790361b9358b01ef58b44298814c803aba04..bb3837d7387ce037cff3d8026b253ee462fb8fb7 100644 (file)
--- 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 6c72495c8dbb2c36ad97d820be2ddfd64d63cf1a..3f2856ed680831f2f574425dc9ed19672b75f7eb 100644 (file)
--- 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"                                                       \