Commit 3bd69581 authored by Vasily Gorbik's avatar Vasily Gorbik
Browse files

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: default avatarVasily Gorbik <gor@linux.ibm.com>
parents 21aadf2e 1874cb13

arch/s390/kernel/entry.S

+2 −2
Original line number Diff line number Diff line
@@ -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)