1 files changed, 6 insertions, 7 deletions

diff --git a/arch/s390/kernel/head64.S b/arch/s390/kernel/head64.S
index cdef6871741..ae5d492b069 100644
--- a/arch/s390/kernel/head64.S
+++ b/arch/s390/kernel/head64.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)
         larl    %r1,sched_clock_base_cc
         mvc     0(8,%r1),__LC_LAST_UPDATE_CLOCK
         larl    %r13,.LPG1              # get base
@@ -46,7 +46,7 @@ startup_continue:
         .align  16
 .LPG1:
 .Lentry:.quad   0x0000000180000000,_stext
-.Lctl:  .quad   0x04350002              # cr0: various things
+.Lctl:  .quad   0x04040000              # cr0: AFP registers & secondary space
         .quad   0                       # cr1: primary space segment table
         .quad   .Lduct                  # cr2: dispatchable unit control table
         .quad   0                       # cr3: instruction authorization
@@ -76,8 +76,7 @@ startup_continue:
         .long   0x80000000,0,0,0        # invalid access-list entries
         .endr
 
-        .globl  _ehead
-_ehead:
+ENTRY(_ehead)
 
 #ifdef CONFIG_SHARED_KERNEL
         .org    0x100000 - 0x11000      # head.o ends at 0x11000
@@ -86,8 +85,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
         stctg   %c0,%c15,0(%r15)