summaryrefslogtreecommitdiffstats
path: root/virt
diff options
context:
space:
mode:
authorScott Wood <scottwood@freescale.com>2014-01-09 18:43:16 -0600
committerPaolo Bonzini <pbonzini@redhat.com>2014-01-15 12:03:23 +0100
commit4a55dd7273c95b4a19fbcf0ae1bbd1cfd09dfc36 (patch)
tree09dadcf8fe69df1b1148698dea0b5e772e8d1019 /virt
parente81d1ad32753cdeaef56b9bffe3b8ab7b5c776e5 (diff)
downloadlinux-stable-4a55dd7273c95b4a19fbcf0ae1bbd1cfd09dfc36.tar.gz
linux-stable-4a55dd7273c95b4a19fbcf0ae1bbd1cfd09dfc36.tar.bz2
linux-stable-4a55dd7273c95b4a19fbcf0ae1bbd1cfd09dfc36.zip
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>
Diffstat (limited to 'virt')
-rw-r--r--virt/kvm/kvm_main.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index b28579e84248..9ed9c8c7b874 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -1735,7 +1735,6 @@ bool kvm_vcpu_yield_to(struct kvm_vcpu *target)
}
EXPORT_SYMBOL_GPL(kvm_vcpu_yield_to);
-#ifdef CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT
/*
* Helper that checks whether a VCPU is eligible for directed yield.
* Most eligible candidate to yield is decided by following heuristics:
@@ -1760,6 +1759,7 @@ EXPORT_SYMBOL_GPL(kvm_vcpu_yield_to);
*/
static bool kvm_vcpu_eligible_for_directed_yield(struct kvm_vcpu *vcpu)
{
+#ifdef CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT
bool eligible;
eligible = !vcpu->spin_loop.in_spin_loop ||
@@ -1770,8 +1770,10 @@ static bool kvm_vcpu_eligible_for_directed_yield(struct kvm_vcpu *vcpu)
kvm_vcpu_set_dy_eligible(vcpu, !vcpu->spin_loop.dy_eligible);
return eligible;
-}
+#else
+ return true;
#endif
+}
void kvm_vcpu_on_spin(struct kvm_vcpu *me)
{