Merge tag 'kvm-s390-next-4.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git...

KVM: s390: Fixes and features for 4.16 part 2

- exitless interrupts for emulated devices (Michael Mueller)
- cleanup of cpuflag handling (David Hildenbrand)
- kvm stat counter improvements (Christian Borntraeger)
- vsie improvements (David Hildenbrand)
- mm cleanup (Janosch Frank)

diff --cc arch/s390/kvm/kvm-s390.c
index de16c224319ce625d2d7d60d6ea2c8dc7fab8017,f85a405e2595a75d086e09358e5b94180c90612a..58bee42d7a9de0360980add641f1c304e4ea3873
--- 1/arch/s390/kvm/kvm-s390.c
--- 2/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@@ -2852,11 -2845,9 +2876,11 @@@ int kvm_arch_vcpu_ioctl_set_guest_debug
        if (rc) {
                vcpu->guest_debug = 0;
                kvm_s390_clear_bp_data(vcpu);
-               atomic_andnot(CPUSTAT_P, &vcpu->arch.sie_block->cpuflags);
+               kvm_s390_clear_cpuflags(vcpu, CPUSTAT_P);
        }
  
 +out:
 +      vcpu_put(vcpu);
        return rc;
  }