Commit 4a55dd7273c95b4a19fbcf0ae1bbd1cfd09dfc36
Committed by
Paolo Bonzini
Paolo Bonzini
1 parent
e81d1ad327
Exists in
master
and in
16 other branches
kvm: Provide kvm_vcpu_eligible_for_directed_yield() stub
Commit 7940876e1330671708186ac3386aa521ffb5c182 ("kvm: make local functions static") broke KVM PPC builds due to removing (rather than moving) the stub version of kvm_vcpu_eligible_for_directed_yield(). This patch reintroduces it. Signed-off-by: Scott Wood <scottwood@freescale.com> Cc: Stephen Hemminger <stephen@networkplumber.org> Cc: Alexander Graf <agraf@suse.de> [Move the #ifdef inside the function. - Paolo] Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Showing 1 changed file with 4 additions and 2 deletions Side-by-side Diff
virt/kvm/kvm_main.c
| ... | ... | @@ -1735,7 +1735,6 @@ |
| 1735 | 1735 | } |
| 1736 | 1736 | EXPORT_SYMBOL_GPL(kvm_vcpu_yield_to); |
| 1737 | 1737 | |
| 1738 | -#ifdef CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT | |
| 1739 | 1738 | /* |
| 1740 | 1739 | * Helper that checks whether a VCPU is eligible for directed yield. |
| 1741 | 1740 | * Most eligible candidate to yield is decided by following heuristics: |
| ... | ... | @@ -1760,6 +1759,7 @@ |
| 1760 | 1759 | */ |
| 1761 | 1760 | static bool kvm_vcpu_eligible_for_directed_yield(struct kvm_vcpu *vcpu) |
| 1762 | 1761 | { |
| 1762 | +#ifdef CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT | |
| 1763 | 1763 | bool eligible; |
| 1764 | 1764 | |
| 1765 | 1765 | eligible = !vcpu->spin_loop.in_spin_loop || |
| 1766 | 1766 | |
| ... | ... | @@ -1770,8 +1770,10 @@ |
| 1770 | 1770 | kvm_vcpu_set_dy_eligible(vcpu, !vcpu->spin_loop.dy_eligible); |
| 1771 | 1771 | |
| 1772 | 1772 | return eligible; |
| 1773 | -} | |
| 1773 | +#else | |
| 1774 | + return true; | |
| 1774 | 1775 | #endif |
| 1776 | +} | |
| 1775 | 1777 | |
| 1776 | 1778 | void kvm_vcpu_on_spin(struct kvm_vcpu *me) |
| 1777 | 1779 | { |