aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/kernel/head64.S
diff options
context:
space:
mode:
authorVasily Gorbik <gor@linux.ibm.com>2019-11-14 14:08:28 +0100
committerVasily Gorbik <gor@linux.ibm.com>2019-11-20 12:58:13 +0100
commitc2313594216b3fde9559e502bb36d14e9d601a56 (patch)
tree13ab7e185f35cbc2d93107bb1fac3e976ccaa8ee /arch/s390/kernel/head64.S
parentb8ce1fa4892cccff0576827c8fd7fcad1698de3b (diff)
downloadlinux-c2313594216b3fde9559e502bb36d14e9d601a56.tar.gz
s390/early: move access registers setup in C code
Reviewed-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Diffstat (limited to 'arch/s390/kernel/head64.S')
-rw-r--r--arch/s390/kernel/head64.S10
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/s390/kernel/head64.S b/arch/s390/kernel/head64.S
index 9d649abddffd97..b9e585f528a69a 100644
--- a/arch/s390/kernel/head64.S
+++ b/arch/s390/kernel/head64.S
@@ -35,13 +35,8 @@ ENTRY(startup_continue)
#ifdef CONFIG_KASAN
brasl %r14,kasan_early_init
#endif
-#
-# Early machine initialization and detection functions.
-#
- brasl %r14,startup_init
-
- lam 0,15,.Laregs-.LPG1(%r13) # load acrs needed by uaccess
- brasl %r14,start_kernel # go to C code
+ brasl %r14,startup_init # s390 specific early init
+ brasl %r14,start_kernel # common init code
#
# We returned from start_kernel ?!? PANIK
#
@@ -51,4 +46,3 @@ ENTRY(startup_continue)
.align 16
.LPG1:
.Ldw: .quad 0x0002000180000000,0x0000000000000000
-.Laregs:.long 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0