Skip to content

Commit 680957b

Browse files
hcahcaVasily Gorbik
authored andcommitted
s390/relocate_kernel: use SYM* macros instead of ENTRY(), etc.
Consistently use the SYM* family of macros instead of the deprecated ENTRY(), ENDPROC(), etc. family of macros. Signed-off-by: Heiko Carstens <hca@linux.ibm.com> Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
1 parent fda1dff commit 680957b

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

arch/s390/kernel/relocate_kernel.S

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
*/
2727

2828
.text
29-
ENTRY(relocate_kernel)
29+
SYM_CODE_START(relocate_kernel)
3030
basr %r13,0 # base address
3131
.base:
3232
lghi %r7,PAGE_SIZE # load PAGE_SIZE in r7
@@ -66,13 +66,11 @@ ENTRY(relocate_kernel)
6666
mvc 0(8,%r0),0(%r4) # copy psw to absolute address 0
6767
.diag:
6868
diag %r0,%r0,0x308
69-
ENDPROC(relocate_kernel)
69+
SYM_CODE_END(relocate_kernel)
7070

71-
.align 8
72-
load_psw:
71+
.balign 8
72+
SYM_DATA_START_LOCAL(load_psw)
7373
.long 0x00080000,0x80000000
74-
relocate_kernel_end:
75-
.align 8
76-
.globl relocate_kernel_len
77-
relocate_kernel_len:
78-
.quad relocate_kernel_end - relocate_kernel
74+
SYM_DATA_END_LABEL(load_psw, SYM_L_LOCAL, relocate_kernel_end)
75+
.balign 8
76+
SYM_DATA(relocate_kernel_len, .quad relocate_kernel_end - relocate_kernel)

0 commit comments

Comments
 (0)