Skip to content

Commit 9b3dcae

Browse files
svens-s390Vasily Gorbik
authored andcommitted
s390/entry: Make ret_from_fork() ready for lowcore relocation
In preparation of having lowcore at different address than zero, add the base register to all lowcore accesses in ret_from_fork(). Reviewed-by: Heiko Carstens <[email protected]> Signed-off-by: Sven Schnelle <[email protected]> Signed-off-by: Vasily Gorbik <[email protected]>
1 parent 7cc86de commit 9b3dcae

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

arch/s390/kernel/entry.S

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -307,12 +307,13 @@ SYM_CODE_START(ret_from_fork)
307307
lgr %r3,%r11
308308
brasl %r14,__ret_from_fork
309309
STACKLEAK_ERASE
310-
lctlg %c1,%c1,__LC_USER_ASCE
311-
mvc __LC_RETURN_PSW(16),STACK_FRAME_OVERHEAD+__PT_PSW(%r15)
310+
GET_LC %r13
311+
lctlg %c1,%c1,__LC_USER_ASCE(%r13)
312+
mvc __LC_RETURN_PSW(16,%r13),STACK_FRAME_OVERHEAD+__PT_PSW(%r15)
312313
BPON
313314
LBEAR STACK_FRAME_OVERHEAD+__PT_LAST_BREAK(%r15)
315+
stpt __LC_EXIT_TIMER(%r13)
314316
lmg %r0,%r15,STACK_FRAME_OVERHEAD+__PT_R0(%r15)
315-
stpt __LC_EXIT_TIMER
316317
LPSWEY __LC_RETURN_PSW,__LC_RETURN_LPSWE
317318
SYM_CODE_END(ret_from_fork)
318319

0 commit comments

Comments
 (0)