diff options
author | Alexander Graf <agraf@suse.de> | 2012-08-10 06:31:12 -0400 |
---|---|---|
committer | Alexander Graf <agraf@suse.de> | 2012-10-05 17:38:42 -0400 |
commit | 2d8185d4ee22f425001d28d1817fc8d478e6fa02 (patch) | |
tree | 963f91875a41bc77c6423e4cf06a5e7fbafe523a | |
parent | 6346046c3a69edc9149311473b940f3af7c93752 (diff) |
KVM: PPC: BookE: No duplicate request != 0 check
We only call kvmppc_check_requests() when vcpu->requests != 0, so drop
the redundant check in the function itself
Signed-off-by: Alexander Graf <agraf@suse.de>
-rw-r--r-- | arch/powerpc/kvm/booke.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c index 00bcc57428c7..683cbd686d01 100644 --- a/arch/powerpc/kvm/booke.c +++ b/arch/powerpc/kvm/booke.c | |||
@@ -457,16 +457,14 @@ int kvmppc_core_prepare_to_enter(struct kvm_vcpu *vcpu) | |||
457 | 457 | ||
458 | static void kvmppc_check_requests(struct kvm_vcpu *vcpu) | 458 | static void kvmppc_check_requests(struct kvm_vcpu *vcpu) |
459 | { | 459 | { |
460 | if (vcpu->requests) { | 460 | trace_kvm_check_requests(vcpu); |
461 | trace_kvm_check_requests(vcpu); | ||
462 | 461 | ||
463 | if (kvm_check_request(KVM_REQ_PENDING_TIMER, vcpu)) | 462 | if (kvm_check_request(KVM_REQ_PENDING_TIMER, vcpu)) |
464 | update_timer_ints(vcpu); | 463 | update_timer_ints(vcpu); |
465 | #if defined(CONFIG_KVM_E500V2) || defined(CONFIG_KVM_E500MC) | 464 | #if defined(CONFIG_KVM_E500V2) || defined(CONFIG_KVM_E500MC) |
466 | if (kvm_check_request(KVM_REQ_TLB_FLUSH, vcpu)) | 465 | if (kvm_check_request(KVM_REQ_TLB_FLUSH, vcpu)) |
467 | kvmppc_core_flush_tlb(vcpu); | 466 | kvmppc_core_flush_tlb(vcpu); |
468 | #endif | 467 | #endif |
469 | } | ||
470 | } | 468 | } |
471 | 469 | ||
472 | /* | 470 | /* |