summaryrefslogtreecommitdiff
path: root/arch/s390
diff options
context:
space:
mode:
authorHeiko Carstens <hca@linux.ibm.com>2023-04-17 15:45:16 +0300
committerVasily Gorbik <gor@linux.ibm.com>2023-04-19 18:24:18 +0300
commit680957b3b8b0b2e8697592fcb77369d4f643908a (patch)
tree0e537c937403b504cbf8eb88e42056d0f7fc6056 /arch/s390
parentfda1dffa44b0ea657e413f1e548022e3f0269592 (diff)
downloadlinux-680957b3b8b0b2e8697592fcb77369d4f643908a.tar.xz
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>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/kernel/relocate_kernel.S16
1 files changed, 7 insertions, 9 deletions
diff --git a/arch/s390/kernel/relocate_kernel.S b/arch/s390/kernel/relocate_kernel.S
index a9a1a6f45375..89a3efce0500 100644
--- a/arch/s390/kernel/relocate_kernel.S
+++ b/arch/s390/kernel/relocate_kernel.S
@@ -26,7 +26,7 @@
*/
.text
-ENTRY(relocate_kernel)
+SYM_CODE_START(relocate_kernel)
basr %r13,0 # base address
.base:
lghi %r7,PAGE_SIZE # load PAGE_SIZE in r7
@@ -66,13 +66,11 @@ ENTRY(relocate_kernel)
mvc 0(8,%r0),0(%r4) # copy psw to absolute address 0
.diag:
diag %r0,%r0,0x308
-ENDPROC(relocate_kernel)
+SYM_CODE_END(relocate_kernel)
- .align 8
- load_psw:
+ .balign 8
+SYM_DATA_START_LOCAL(load_psw)
.long 0x00080000,0x80000000
- relocate_kernel_end:
- .align 8
- .globl relocate_kernel_len
- relocate_kernel_len:
- .quad relocate_kernel_end - relocate_kernel
+SYM_DATA_END_LABEL(load_psw, SYM_L_LOCAL, relocate_kernel_end)
+ .balign 8
+SYM_DATA(relocate_kernel_len, .quad relocate_kernel_end - relocate_kernel)