From: Radim Krčmář <rkrcmar@redhat.com>
Date: Tue, 30 Jan 2018 16:42:40 +0000 (+0100)
Subject: Merge tag 'kvm-s390-next-4.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.16-rc1~10^2~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=92ea2b3381d7dc4223375f4337dcadb1fd556576;p=thirdparty%2Flinux.git

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

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)
---

92ea2b3381d7dc4223375f4337dcadb1fd556576
diff --cc arch/s390/kvm/kvm-s390.c
index de16c224319ce,f85a405e2595a..58bee42d7a9de
--- a/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;
  }