1 files changed, 6 insertions, 7 deletions

diff --git a/arch/s390/kernel/head31.S b/arch/s390/kernel/head31.S
index b8f8dc126102..f21954b44dc1 100644
--- a/arch/s390/kernel/head31.S
+++ b/arch/s390/kernel/head31.S
@@ -11,13 +11,13 @@
  */
 
 #include <linux/init.h>
+#include <linux/linkage.h>
 #include <asm/asm-offsets.h>
 #include <asm/thread_info.h>
 #include <asm/page.h>
 
 __HEAD
-        .globl  startup_continue
-startup_continue:
+ENTRY(startup_continue)
         basr    %r13,0                  # get base
 .LPG1:
 
@@ -45,7 +45,7 @@ startup_continue:
                                         # virtual and never return ...
         .align  8
 .Lentry:.long   0x00080000,0x80000000 + _stext
-.Lctl:  .long   0x04b50002              # cr0: various things
+.Lctl:  .long   0x04b50000              # cr0: various things
         .long   0                       # cr1: primary space segment table
         .long   .Lduct                  # cr2: dispatchable unit control table
         .long   0                       # cr3: instruction authorization
@@ -78,8 +78,7 @@ startup_continue:
 .Lbase_cc:
         .long   sched_clock_base_cc
 
-        .globl  _ehead
-_ehead:
+ENTRY(_ehead)
 
 #ifdef CONFIG_SHARED_KERNEL
         .org    0x100000 - 0x11000      # head.o ends at 0x11000
@@ -88,8 +87,8 @@ _ehead:
 #
 # startup-code, running in absolute addressing mode
 #
-        .globl  _stext
-_stext: basr    %r13,0                  # get base
+ENTRY(_stext)
+        basr    %r13,0                  # get base
 .LPG3:
 # check control registers
         stctl   %c0,%c15,0(%r15)