diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2017-06-30 13:38:26 +0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2017-06-30 13:38:26 +0300 |
| commit | 04a7ea04d508b925e7f829305b358157d58b4f82 (patch) | |
| tree | d75fb98c733277ba35986046103595c3cb79c39b /arch/s390/kvm/kvm-s390.c | |
| parent | c853354429f7ec88f9cdde4e46e69a2c0e3c8310 (diff) | |
| parent | d38338e396ee0571b3502962fd2fbaec4d2d9a8f (diff) | |
| download | linux-04a7ea04d508b925e7f829305b358157d58b4f82.tar.xz | |
Merge tag 'kvmarm-for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/ARM updates for 4.13
- vcpu request overhaul
- allow timer and PMU to have their interrupt number
selected from userspace
- workaround for Cavium erratum 30115
- handling of memory poisonning
- the usual crop of fixes and cleanups
Conflicts:
arch/s390/include/asm/kvm_host.h
Diffstat (limited to 'arch/s390/kvm/kvm-s390.c')
| -rw-r--r-- | arch/s390/kvm/kvm-s390.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index a0f6b599ce6b..ef6419654c16 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -2777,7 +2777,7 @@ static int kvm_s390_handle_requests(struct kvm_vcpu *vcpu) { retry: kvm_s390_vcpu_request_handled(vcpu); - if (!vcpu->requests) + if (!kvm_request_pending(vcpu)) return 0; /* * We use MMU_RELOAD just to re-arm the ipte notifier for the |