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"							\