Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm into next

[karo-tx-linux.git] / arch / s390 / kvm / kvm-s390.c

diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index 43e191b257898c788a27279cb39c3e681be81bbd..2f3e14fe91a4882d0c5ed5599e1d6f0da2f750f0 100644 (file)
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -162,6 +162,7 @@ int kvm_dev_ioctl_check_extension(long ext)
        case KVM_CAP_ONE_REG:
        case KVM_CAP_ENABLE_CAP:
        case KVM_CAP_S390_CSS_SUPPORT:
+       case KVM_CAP_IRQFD:
        case KVM_CAP_IOEVENTFD:
        case KVM_CAP_DEVICE_CTRL:
        case KVM_CAP_ENABLE_CAP_VM:
@@ -1162,7 +1163,7 @@ static int vcpu_pre_run(struct kvm_vcpu *vcpu)
        if (need_resched())
                schedule();
 
-       if (test_thread_flag(TIF_MCCK_PENDING))
+       if (test_cpu_flag(CIF_MCCK_PENDING))
                s390_handle_mcck();
 
        if (!kvm_is_ucontrol(vcpu->kvm))