s390/head64: 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>

diff --git a/arch/s390/kernel/head64.S b/arch/s390/kernel/head64.S
index f67982f562db13497a57fdf80a3456913e86f2a8..df77ba102096499179a561dc66d18c642ac8677b 100644 (file)
--- a/arch/s390/kernel/head64.S
+++ b/arch/s390/kernel/head64.S
@@ -16,7 +16,7 @@
 #include <asm/ptrace.h>
 
 __HEAD
-ENTRY(startup_continue)
+SYM_CODE_START(startup_continue)
        larl    %r1,tod_clock_base
        mvc     0(16,%r1),__LC_BOOT_CLOCK
 #
@@ -33,8 +33,8 @@ ENTRY(startup_continue)
 # We returned from start_kernel ?!? PANIK
 #
        basr    %r13,0
-       lpswe   .Ldw-.(%r13)            # load disabled wait psw
+       lpswe   dw_psw-.(%r13)          # load disabled wait psw
+SYM_CODE_END(startup_continue)
 
        .align  16
-.LPG1:
-.Ldw:  .quad   0x0002000180000000,0x0000000000000000
+SYM_DATA_LOCAL(dw_psw, .quad 0x0002000180000000,0x0000000000000000)