diff options
| author | Vasily Gorbik <gor@linux.ibm.com> | 2021-06-07 17:11:10 +0200 |
|---|---|---|
| committer | Vasily Gorbik <gor@linux.ibm.com> | 2021-06-07 17:11:10 +0200 |
| commit | 3bd695813628816a49cb8d79e3398796c9de79f2 (patch) | |
| tree | 98a51c076f65528ab04c591c3969887803cd1c91 /arch/s390/kernel/entry.S | |
| parent | 21aadf2eb055187ae8724997e6aca76e0d548447 (diff) | |
| parent | 1874cb13d5d7cafa61ce93a760093ebc5485b6ab (diff) | |
Merge branch 's390/fixes' into features
This helps to avoid merge conflicts later.
* fixes:
s390/mcck: fix invalid KVM guest condition check
s390/mcck: fix calculation of SIE critical section size
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Diffstat (limited to 'arch/s390/kernel/entry.S')
| -rw-r--r-- | arch/s390/kernel/entry.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S index e7094ab8eb2c..a070a5d10409 100644 --- a/arch/s390/kernel/entry.S +++ b/arch/s390/kernel/entry.S @@ -652,9 +652,9 @@ ENDPROC(stack_overflow) .Lcleanup_sie_mcck: larl %r13,.Lsie_entry slgr %r9,%r13 - larl %r13,.Lsie_skip + lghi %r13,.Lsie_skip - .Lsie_entry clgr %r9,%r13 - jh .Lcleanup_sie_int + jhe .Lcleanup_sie_int oi __LC_CPU_FLAGS+7, _CIF_MCCK_GUEST .Lcleanup_sie_int: BPENTER __SF_SIE_FLAGS(%r15),(_TIF_ISOLATE_BP|_TIF_ISOLATE_BP_GUEST) |