Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fix from Martin Schwidefsky:
"A fix for a regression in regard to machine check handling in KVM.
Keeping my fingers crossed that this is the last s390 fix for v4.14"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/kvm: fix detection of guest machine checks
+5
-2
+5
-2
arch/s390/kernel/entry.S
+5
-2
arch/s390/kernel/entry.S
···
521
521
tmhh %r8,0x0001 # test problem state bit
522
522
jnz 2f # -> fault in user space
523
523
#if IS_ENABLED(CONFIG_KVM)
524
-
# cleanup critical section for sie64a
524
+
# cleanup critical section for program checks in sie64a
525
525
lgr %r14,%r9
526
526
slg %r14,BASED(.Lsie_critical_start)
527
527
clg %r14,BASED(.Lsie_critical_length)
528
528
jhe 0f
529
-
brasl %r14,.Lcleanup_sie
529
+
lg %r14,__SF_EMPTY(%r15) # get control block pointer
530
+
ni __SIE_PROG0C+3(%r14),0xfe # no longer in SIE
531
+
lctlg %c1,%c1,__LC_USER_ASCE # load primary asce
532
+
larl %r9,sie_exit # skip forward to sie_exit
530
533
#endif
531
534
0: tmhh %r8,0x4000 # PER bit set in old PSW ?
532
535
jnz 1f # -> enabled, can't be a double fault