Skip to content

Commit ca2f0a2

Browse files
svens-s390Vasily Gorbik
authored andcommitted
s390/entry: Add base register to MBEAR macro
In preparation of having lowcore at different address than zero, add the base register to MBEAR. No functional change, because %r0 is passed to the macro. 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 12184a4 commit ca2f0a2

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

arch/s390/kernel/entry.S

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,9 @@ _LPP_OFFSET = __LC_LPP
4444
ALTERNATIVE "b \lpswe; nopr", ".insn siy,0xeb0000000071,\address,0", ALT_FACILITY(193)
4545
.endm
4646

47-
.macro MBEAR reg
48-
ALTERNATIVE "brcl 0,0", __stringify(mvc __PT_LAST_BREAK(8,\reg),__LC_LAST_BREAK), ALT_FACILITY(193)
47+
.macro MBEAR reg, lowcore
48+
ALTERNATIVE "brcl 0,0", __stringify(mvc __PT_LAST_BREAK(8,\reg),__LC_LAST_BREAK(\lowcore)),\
49+
ALT_FACILITY(193)
4950
.endm
5051

5152
.macro CHECK_STACK savearea
@@ -282,7 +283,7 @@ SYM_CODE_START(system_call)
282283
xgr %r11,%r11
283284
la %r2,STACK_FRAME_OVERHEAD(%r15) # pointer to pt_regs
284285
mvc __PT_R8(64,%r2),__LC_SAVE_AREA_SYNC
285-
MBEAR %r2
286+
MBEAR %r2,%r0
286287
lgr %r3,%r14
287288
brasl %r14,__do_syscall
288289
STACKLEAK_ERASE
@@ -424,7 +425,7 @@ SYM_CODE_START(\name)
424425
xgr %r10,%r10
425426
xc __PT_FLAGS(8,%r11),__PT_FLAGS(%r11)
426427
mvc __PT_R8(64,%r11),__LC_SAVE_AREA_ASYNC
427-
MBEAR %r11
428+
MBEAR %r11,%r0
428429
stmg %r8,%r9,__PT_PSW(%r11)
429430
lgr %r2,%r11 # pass pointer to pt_regs
430431
brasl %r14,\handler

0 commit comments

Comments
 (0)