Commit 27d45655 authored by Heiko Carstens's avatar Heiko Carstens Committed by Alexander Gordeev
Browse files

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: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
parent 938f0c35

arch/s390/boot/head.S

+7 −7
Original line number Diff line number Diff line
@@ -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

arch/s390/boot/head_kdump.S

+3 −3
Original line number Diff line number Diff line
@@ -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 */

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

+2 −2
Original line number Diff line number Diff line
@@ -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);)					\

arch/s390/kernel/entry.S

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/s390/kernel/head64.S

+1 −1
Original line number Diff line number Diff line
@@ -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)