Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

s390: consistently use .balign instead of .align

The .align directive has inconsistent behavior across architectures. Use
.balign instead everywhere. This is a no-op for s390, but with this there
is no mix in using .align and .balign anymore.

Future code is supposed to use only .balign.

Reviewed-by: Alexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>

authored by

Heiko Carstens and committed by
Alexander Gordeev
27d45655 938f0c35

+17 -17
+7 -7
arch/s390/boot/head.S
··· 185 185 larl %r13,.Lcrash 186 186 lpsw 0(%r13) 187 187 188 - .align 8 188 + .balign 8 189 189 .Lwaitpsw: 190 190 .quad 0x0202000180000000,.Lioint 191 191 .Lnewpswmask: 192 192 .quad 0x0000000180000000 193 - .align 8 193 + .balign 8 194 194 .Lorb: .long 0x00000000,0x0080ff00,.Lccws 195 195 .Lirb: .long 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 196 - .align 8 196 + .balign 8 197 197 .Lcr6: .quad 0x00000000ff000000 198 - .align 8 198 + .balign 8 199 199 .Lcrash:.long 0x000a0000,0x00000000 200 - .align 8 200 + .balign 8 201 201 .Lccws: .rept 19 202 202 .long 0x02600050,0x00000000 203 203 .endr ··· 207 207 .byte 0xc8,0xd6,0xd3,0xc4 # "change rdr all keep nohold" 208 208 .L_eof: .long 0xc5d6c600 /* C'EOF' */ 209 209 .L_hdr: .long 0xc8c4d900 /* C'HDR' */ 210 - .align 8 210 + .balign 8 211 211 .Lcpuid:.fill 8,1,0 212 212 213 213 # ··· 265 265 brasl %r14,startup_kernel 266 266 SYM_CODE_END(startup_normal) 267 267 268 - .align 8 268 + .balign 8 269 269 6: .long 0x7fffffff,0xffffffff 270 270 .Lext_new_psw: 271 271 .quad 0x0002000180000000,0x1b0 # disabled wait
+3 -3
arch/s390/boot/head_kdump.S
··· 82 82 # 83 83 # Startup of kdump (relocated new kernel) 84 84 # 85 - .align 2 85 + .balign 2 86 86 startup_kdump_relocated: 87 87 basr %r13,0 88 88 0: lpswe .Lrestart_psw-0b(%r13) # Start new kernel... 89 89 SYM_CODE_END(startup_kdump) 90 - .align 8 90 + .balign 8 91 91 .Lrestart_psw: 92 92 .quad 0x0000000080000000,0x0000000000000000 + startup 93 93 #else ··· 95 95 larl %r13,startup_kdump_crash 96 96 lpswe 0(%r13) 97 97 SYM_CODE_END(startup_kdump) 98 - .align 8 98 + .balign 8 99 99 startup_kdump_crash: 100 100 .quad 0x0002000080000000,0x0000000000000000 + startup_kdump_crash 101 101 #endif /* CONFIG_CRASH_DUMP */
+2 -2
arch/s390/include/asm/asm-extable.h
··· 25 25 26 26 #define __EX_TABLE(_section, _fault, _target, _type) \ 27 27 stringify_in_c(.section _section,"a";) \ 28 - stringify_in_c(.align 4;) \ 28 + stringify_in_c(.balign 4;) \ 29 29 stringify_in_c(.long (_fault) - .;) \ 30 30 stringify_in_c(.long (_target) - .;) \ 31 31 stringify_in_c(.short (_type);) \ ··· 34 34 35 35 #define __EX_TABLE_UA(_section, _fault, _target, _type, _regerr, _regaddr, _len)\ 36 36 stringify_in_c(.section _section,"a";) \ 37 - stringify_in_c(.align 4;) \ 37 + stringify_in_c(.balign 4;) \ 38 38 stringify_in_c(.long (_fault) - .;) \ 39 39 stringify_in_c(.long (_target) - .;) \ 40 40 stringify_in_c(.short (_type);) \
+1 -1
arch/s390/kernel/entry.S
··· 136 136 clgfrl %r14,.Lrange_size\@ 137 137 jhe \outside_label 138 138 .section .rodata, "a" 139 - .align 4 139 + .balign 4 140 140 .Lrange_size\@: 141 141 .long \end - \start 142 142 .previous
+1 -1
arch/s390/kernel/head64.S
··· 36 36 lpswe dw_psw-.(%r13) # load disabled wait psw 37 37 SYM_CODE_END(startup_continue) 38 38 39 - .align 16 39 + .balign 16 40 40 SYM_DATA_LOCAL(dw_psw, .quad 0x0002000180000000,0x0000000000000000)
+1 -1
arch/s390/kernel/kprobes_insn_page.S
··· 13 13 * would be in the data section instead. 14 14 */ 15 15 .section .kprobes.text, "ax" 16 - .align 4096 16 + .balign 4096 17 17 SYM_CODE_START(kprobes_insn_page) 18 18 .rept 2048 19 19 .word 0x07fe
+2 -2
arch/s390/net/bpf_jit_comp.c
··· 523 523 #define BPF_PLT_SIZE 32 524 524 asm( 525 525 ".pushsection .rodata\n" 526 - " .align 8\n" 526 + " .balign 8\n" 527 527 "bpf_plt:\n" 528 528 " lgrl %r0,bpf_plt_ret\n" 529 529 " lgrl %r1,bpf_plt_target\n" 530 530 " br %r1\n" 531 - " .align 8\n" 531 + " .balign 8\n" 532 532 "bpf_plt_ret: .quad 0\n" 533 533 "bpf_plt_target: .quad 0\n" 534 534 "bpf_plt_end:\n"