Skip to content

Commit 39e8c5d

Browse files
svens-s390Vasily Gorbik
authored andcommitted
s390/head64: Make startup code ready for lowcore relocation
In preparation of having lowcore at different address than zero, add the base register to all lowcore accesses in startup_continue(). Reviewed-by: Heiko Carstens <hca@linux.ibm.com> Signed-off-by: Sven Schnelle <svens@linux.ibm.com> Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
1 parent 5ade5be commit 39e8c5d

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

arch/s390/kernel/head64.S

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
#include <linux/init.h>
1212
#include <linux/linkage.h>
13+
#include <asm/lowcore.h>
1314
#include <asm/asm-offsets.h>
1415
#include <asm/thread_info.h>
1516
#include <asm/page.h>
@@ -18,14 +19,15 @@
1819
__HEAD
1920
SYM_CODE_START(startup_continue)
2021
larl %r1,tod_clock_base
21-
mvc 0(16,%r1),__LC_BOOT_CLOCK
22+
GET_LC %r2
23+
mvc 0(16,%r1),__LC_BOOT_CLOCK(%r2)
2224
#
2325
# Setup stack
2426
#
2527
larl %r14,init_task
26-
stg %r14,__LC_CURRENT
28+
stg %r14,__LC_CURRENT(%r2)
2729
larl %r15,init_thread_union+STACK_INIT_OFFSET
28-
stg %r15,__LC_KERNEL_STACK
30+
stg %r15,__LC_KERNEL_STACK(%r2)
2931
brasl %r14,sclp_early_adjust_va # allow sclp_early_printk
3032
brasl %r14,startup_init # s390 specific early init
3133
brasl %r14,start_kernel # common init code

0 commit comments

Comments
 (0)