1 files changed, 3 insertions, 5 deletions

diff --git a/arch/s390/kernel/switch_cpu64.S b/arch/s390/kernel/switch_cpu64.S
index 5be3f43898f9..fcc42d799e41 100644
--- a/arch/s390/kernel/switch_cpu64.S
+++ b/arch/s390/kernel/switch_cpu64.S
@@ -5,6 +5,7 @@
  *
  */
 
+#include <linux/linkage.h>
 #include <asm/asm-offsets.h>
 #include <asm/ptrace.h>
 
@@ -16,9 +17,7 @@
 #            %r6 - destination cpu
 
         .section .text
-        .align 4
-        .globl smp_switch_to_cpu
-smp_switch_to_cpu:
+ENTRY(smp_switch_to_cpu)
         stmg    %r6,%r15,__SF_GPRS(%r15)
         lgr     %r1,%r15
         aghi    %r15,-STACK_FRAME_OVERHEAD
@@ -31,8 +30,7 @@ smp_switch_to_cpu:
         brc     2,2b                    /* busy, try again */
 3:      j       3b
 
-        .globl  smp_restart_cpu
-smp_restart_cpu:
+ENTRY(smp_restart_cpu)
         larl    %r1,.gprregs
         lmg     %r0,%r15,0(%r1)
 1:      sigp    %r0,%r5,__SIGP_SENSE    /* Wait for calling CPU */