Merge tag 'pci-v5.18-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / arch / s390 / include / asm / alternative-asm.h

diff --git a/arch/s390/include/asm/alternative-asm.h b/arch/s390/include/asm/alternative-asm.h
index 955d620db23edf04d1c8c946c22a4ccc219e9f74..bb3837d7387ce037cff3d8026b253ee462fb8fb7 100644 (file)
--- a/arch/s390/include/asm/alternative-asm.h
+++ b/arch/s390/include/asm/alternative-asm.h
@@ -37,9 +37,15 @@
  * a 2-byte nop if the size of the area is not divisible by 6.
  */
 .macro alt_pad_fill bytes
-       .fill   ( \bytes ) / 6, 6, 0xc0040000
-       .fill   ( \bytes ) % 6 / 4, 4, 0x47000000
-       .fill   ( \bytes ) % 6 % 4 / 2, 2, 0x0700
+       .rept   ( \bytes ) / 6
+       brcl    0,0
+       .endr
+       .rept   ( \bytes ) % 6 / 4
+       nop
+       .endr
+       .rept   ( \bytes ) % 6 % 4 / 2
+       nopr
+       .endr
 .endm
 
 /*