summaryrefslogtreecommitdiffstats
path: root/arch/s390
diff options
context:
space:
mode:
authorDavid Hildenbrand <dahi@linux.vnet.ibm.com>2015-09-23 12:25:15 +0200
committerChristian Borntraeger <borntraeger@de.ibm.com>2015-10-13 15:50:33 +0200
commit118b862b153190f92415ece4cb97a896929c5ab8 (patch)
tree3085780c94baced13c5c9eccc8b60977cf9c392b /arch/s390
parent5f94c58ed0a6db016528d8555f1b655ad354f7bb (diff)
downloadlinux-118b862b153190f92415ece4cb97a896929c5ab8.tar.gz
linux-118b862b153190f92415ece4cb97a896929c5ab8.tar.bz2
linux-118b862b153190f92415ece4cb97a896929c5ab8.zip
KVM: s390: kvm_arch_vcpu_runnable already cares about timer interrupts
We can remove that double check. Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com> Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/kvm/interrupt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c
index 4f05520efbae..1260f8c18df9 100644
--- a/arch/s390/kvm/interrupt.c
+++ b/arch/s390/kvm/interrupt.c
@@ -839,7 +839,7 @@ int kvm_s390_handle_wait(struct kvm_vcpu *vcpu)
vcpu->stat.exit_wait_state++;
/* fast path */
- if (kvm_cpu_has_pending_timer(vcpu) || kvm_arch_vcpu_runnable(vcpu))
+ if (kvm_arch_vcpu_runnable(vcpu))
return 0;
if (psw_interrupts_disabled(vcpu)) {