Skip to content

Commit 27d4565

Browse files
hcahcaAlexander Gordeev
authored andcommitted
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>
1 parent 938f0c3 commit 27d4565

7 files changed

Lines changed: 17 additions & 17 deletions

File tree

arch/s390/boot/head.S

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -185,19 +185,19 @@ ipl_start:
185185
larl %r13,.Lcrash
186186
lpsw 0(%r13)
187187

188-
.align 8
188+
.balign 8
189189
.Lwaitpsw:
190190
.quad 0x0202000180000000,.Lioint
191191
.Lnewpswmask:
192192
.quad 0x0000000180000000
193-
.align 8
193+
.balign 8
194194
.Lorb: .long 0x00000000,0x0080ff00,.Lccws
195195
.Lirb: .long 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
196-
.align 8
196+
.balign 8
197197
.Lcr6: .quad 0x00000000ff000000
198-
.align 8
198+
.balign 8
199199
.Lcrash:.long 0x000a0000,0x00000000
200-
.align 8
200+
.balign 8
201201
.Lccws: .rept 19
202202
.long 0x02600050,0x00000000
203203
.endr
@@ -207,7 +207,7 @@ ipl_start:
207207
.byte 0xc8,0xd6,0xd3,0xc4 # "change rdr all keep nohold"
208208
.L_eof: .long 0xc5d6c600 /* C'EOF' */
209209
.L_hdr: .long 0xc8c4d900 /* C'HDR' */
210-
.align 8
210+
.balign 8
211211
.Lcpuid:.fill 8,1,0
212212

213213
#
@@ -265,7 +265,7 @@ SYM_CODE_START_LOCAL(startup_normal)
265265
brasl %r14,startup_kernel
266266
SYM_CODE_END(startup_normal)
267267

268-
.align 8
268+
.balign 8
269269
6: .long 0x7fffffff,0xffffffff
270270
.Lext_new_psw:
271271
.quad 0x0002000180000000,0x1b0 # disabled wait

arch/s390/boot/head_kdump.S

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,20 +82,20 @@ SYM_CODE_START_LOCAL(startup_kdump)
8282
#
8383
# Startup of kdump (relocated new kernel)
8484
#
85-
.align 2
85+
.balign 2
8686
startup_kdump_relocated:
8787
basr %r13,0
8888
0: lpswe .Lrestart_psw-0b(%r13) # Start new kernel...
8989
SYM_CODE_END(startup_kdump)
90-
.align 8
90+
.balign 8
9191
.Lrestart_psw:
9292
.quad 0x0000000080000000,0x0000000000000000 + startup
9393
#else
9494
SYM_CODE_START_LOCAL(startup_kdump)
9595
larl %r13,startup_kdump_crash
9696
lpswe 0(%r13)
9797
SYM_CODE_END(startup_kdump)
98-
.align 8
98+
.balign 8
9999
startup_kdump_crash:
100100
.quad 0x0002000080000000,0x0000000000000000 + startup_kdump_crash
101101
#endif /* CONFIG_CRASH_DUMP */

arch/s390/include/asm/asm-extable.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
#define __EX_TABLE(_section, _fault, _target, _type) \
2727
stringify_in_c(.section _section,"a";) \
28-
stringify_in_c(.align 4;) \
28+
stringify_in_c(.balign 4;) \
2929
stringify_in_c(.long (_fault) - .;) \
3030
stringify_in_c(.long (_target) - .;) \
3131
stringify_in_c(.short (_type);) \
@@ -34,7 +34,7 @@
3434

3535
#define __EX_TABLE_UA(_section, _fault, _target, _type, _regerr, _regaddr, _len)\
3636
stringify_in_c(.section _section,"a";) \
37-
stringify_in_c(.align 4;) \
37+
stringify_in_c(.balign 4;) \
3838
stringify_in_c(.long (_fault) - .;) \
3939
stringify_in_c(.long (_target) - .;) \
4040
stringify_in_c(.short (_type);) \

arch/s390/kernel/entry.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ _LPP_OFFSET = __LC_LPP
136136
clgfrl %r14,.Lrange_size\@
137137
jhe \outside_label
138138
.section .rodata, "a"
139-
.align 4
139+
.balign 4
140140
.Lrange_size\@:
141141
.long \end - \start
142142
.previous

arch/s390/kernel/head64.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,5 @@ SYM_CODE_START(startup_continue)
3636
lpswe dw_psw-.(%r13) # load disabled wait psw
3737
SYM_CODE_END(startup_continue)
3838

39-
.align 16
39+
.balign 16
4040
SYM_DATA_LOCAL(dw_psw, .quad 0x0002000180000000,0x0000000000000000)

arch/s390/kernel/kprobes_insn_page.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* would be in the data section instead.
1414
*/
1515
.section .kprobes.text, "ax"
16-
.align 4096
16+
.balign 4096
1717
SYM_CODE_START(kprobes_insn_page)
1818
.rept 2048
1919
.word 0x07fe

arch/s390/net/bpf_jit_comp.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -523,12 +523,12 @@ extern const char bpf_plt_end[];
523523
#define BPF_PLT_SIZE 32
524524
asm(
525525
".pushsection .rodata\n"
526-
" .align 8\n"
526+
" .balign 8\n"
527527
"bpf_plt:\n"
528528
" lgrl %r0,bpf_plt_ret\n"
529529
" lgrl %r1,bpf_plt_target\n"
530530
" br %r1\n"
531-
" .align 8\n"
531+
" .balign 8\n"
532532
"bpf_plt_ret: .quad 0\n"
533533
"bpf_plt_target: .quad 0\n"
534534
"bpf_plt_end:\n"

0 commit comments

Comments
 (0)