tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge tag 'kvm-s390-master-6.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD

KVM: s390: Fix for 6.9

Fix wild read on capability check.

Paolo Bonzini 0a9c28be 16c20208

options
unified split
Changed files
+1 -1
arch
s390
kvm
kvm-s390.c
+1 -1
arch/s390/kvm/kvm-s390.c
··· 587 587 break; 588 588 case KVM_CAP_S390_HPAGE_1M: 589 589 r = 0; 590 - if (hpage && !kvm_is_ucontrol(kvm)) 590 + if (hpage && !(kvm && kvm_is_ucontrol(kvm))) 591 591 r = 1; 592 592 break; 593 593 case KVM_CAP_S390_MEM_OP: