Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Scott Wood and committed by
Paolo Bonzini
4a55dd72 e81d1ad3

+4 -2
+4 -2
virt/kvm/kvm_main.c
··· 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: ··· 1759 1760 */ 1760 1761 static bool kvm_vcpu_eligible_for_directed_yield(struct kvm_vcpu *vcpu) 1761 1762 { 1763 + #ifdef CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT 1762 1764 bool eligible; 1763 1765 1764 1766 eligible = !vcpu->spin_loop.in_spin_loop || ··· 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 {