mirror of
https://github.com/torvalds/linux.git
synced 2024-11-13 23:51:39 +00:00
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>
This commit is contained in:
parent
938f0c35d7
commit
27d45655fa
@ -185,19 +185,19 @@ ipl_start:
|
||||
larl %r13,.Lcrash
|
||||
lpsw 0(%r13)
|
||||
|
||||
.align 8
|
||||
.balign 8
|
||||
.Lwaitpsw:
|
||||
.quad 0x0202000180000000,.Lioint
|
||||
.Lnewpswmask:
|
||||
.quad 0x0000000180000000
|
||||
.align 8
|
||||
.balign 8
|
||||
.Lorb: .long 0x00000000,0x0080ff00,.Lccws
|
||||
.Lirb: .long 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
|
||||
.align 8
|
||||
.balign 8
|
||||
.Lcr6: .quad 0x00000000ff000000
|
||||
.align 8
|
||||
.balign 8
|
||||
.Lcrash:.long 0x000a0000,0x00000000
|
||||
.align 8
|
||||
.balign 8
|
||||
.Lccws: .rept 19
|
||||
.long 0x02600050,0x00000000
|
||||
.endr
|
||||
@ -207,7 +207,7 @@ ipl_start:
|
||||
.byte 0xc8,0xd6,0xd3,0xc4 # "change rdr all keep nohold"
|
||||
.L_eof: .long 0xc5d6c600 /* C'EOF' */
|
||||
.L_hdr: .long 0xc8c4d900 /* C'HDR' */
|
||||
.align 8
|
||||
.balign 8
|
||||
.Lcpuid:.fill 8,1,0
|
||||
|
||||
#
|
||||
@ -265,7 +265,7 @@ SYM_CODE_START_LOCAL(startup_normal)
|
||||
brasl %r14,startup_kernel
|
||||
SYM_CODE_END(startup_normal)
|
||||
|
||||
.align 8
|
||||
.balign 8
|
||||
6: .long 0x7fffffff,0xffffffff
|
||||
.Lext_new_psw:
|
||||
.quad 0x0002000180000000,0x1b0 # disabled wait
|
||||
|
@ -82,12 +82,12 @@ SYM_CODE_START_LOCAL(startup_kdump)
|
||||
#
|
||||
# Startup of kdump (relocated new kernel)
|
||||
#
|
||||
.align 2
|
||||
.balign 2
|
||||
startup_kdump_relocated:
|
||||
basr %r13,0
|
||||
0: lpswe .Lrestart_psw-0b(%r13) # Start new kernel...
|
||||
SYM_CODE_END(startup_kdump)
|
||||
.align 8
|
||||
.balign 8
|
||||
.Lrestart_psw:
|
||||
.quad 0x0000000080000000,0x0000000000000000 + startup
|
||||
#else
|
||||
@ -95,7 +95,7 @@ SYM_CODE_START_LOCAL(startup_kdump)
|
||||
larl %r13,startup_kdump_crash
|
||||
lpswe 0(%r13)
|
||||
SYM_CODE_END(startup_kdump)
|
||||
.align 8
|
||||
.balign 8
|
||||
startup_kdump_crash:
|
||||
.quad 0x0002000080000000,0x0000000000000000 + startup_kdump_crash
|
||||
#endif /* CONFIG_CRASH_DUMP */
|
||||
|
@ -25,7 +25,7 @@
|
||||
|
||||
#define __EX_TABLE(_section, _fault, _target, _type) \
|
||||
stringify_in_c(.section _section,"a";) \
|
||||
stringify_in_c(.align 4;) \
|
||||
stringify_in_c(.balign 4;) \
|
||||
stringify_in_c(.long (_fault) - .;) \
|
||||
stringify_in_c(.long (_target) - .;) \
|
||||
stringify_in_c(.short (_type);) \
|
||||
@ -34,7 +34,7 @@
|
||||
|
||||
#define __EX_TABLE_UA(_section, _fault, _target, _type, _regerr, _regaddr, _len)\
|
||||
stringify_in_c(.section _section,"a";) \
|
||||
stringify_in_c(.align 4;) \
|
||||
stringify_in_c(.balign 4;) \
|
||||
stringify_in_c(.long (_fault) - .;) \
|
||||
stringify_in_c(.long (_target) - .;) \
|
||||
stringify_in_c(.short (_type);) \
|
||||
|
@ -136,7 +136,7 @@ _LPP_OFFSET = __LC_LPP
|
||||
clgfrl %r14,.Lrange_size\@
|
||||
jhe \outside_label
|
||||
.section .rodata, "a"
|
||||
.align 4
|
||||
.balign 4
|
||||
.Lrange_size\@:
|
||||
.long \end - \start
|
||||
.previous
|
||||
|
@ -36,5 +36,5 @@ SYM_CODE_START(startup_continue)
|
||||
lpswe dw_psw-.(%r13) # load disabled wait psw
|
||||
SYM_CODE_END(startup_continue)
|
||||
|
||||
.align 16
|
||||
.balign 16
|
||||
SYM_DATA_LOCAL(dw_psw, .quad 0x0002000180000000,0x0000000000000000)
|
||||
|
@ -13,7 +13,7 @@
|
||||
* would be in the data section instead.
|
||||
*/
|
||||
.section .kprobes.text, "ax"
|
||||
.align 4096
|
||||
.balign 4096
|
||||
SYM_CODE_START(kprobes_insn_page)
|
||||
.rept 2048
|
||||
.word 0x07fe
|
||||
|
@ -523,12 +523,12 @@ extern const char bpf_plt_end[];
|
||||
#define BPF_PLT_SIZE 32
|
||||
asm(
|
||||
".pushsection .rodata\n"
|
||||
" .align 8\n"
|
||||
" .balign 8\n"
|
||||
"bpf_plt:\n"
|
||||
" lgrl %r0,bpf_plt_ret\n"
|
||||
" lgrl %r1,bpf_plt_target\n"
|
||||
" br %r1\n"
|
||||
" .align 8\n"
|
||||
" .balign 8\n"
|
||||
"bpf_plt_ret: .quad 0\n"
|
||||
"bpf_plt_target: .quad 0\n"
|
||||
"bpf_plt_end:\n"
|
||||
|
Loading…
Reference in New Issue
Block a user