kvm.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Alexander Graf <agraf@suse.de>
To: KVM devel mailing list <kvm@vger.kernel.org>
Cc: kvm-ppc@vger.kernel.org, Marcelo Tosatti <mtosatti@redhat.com>,
	Avi Kivity <avi@redhat.com>, Michael Neuling <mikey@neuling.org>
Subject: [PATCH 6/7] powerpc kvm: fix kvmppc_start_thread() for CONFIG_SMP=N
Date: Sun, 25 Dec 2011 11:58:34 +0100	[thread overview]
Message-ID: <1324810715-28312-7-git-send-email-agraf@suse.de> (raw)
In-Reply-To: <1324810715-28312-1-git-send-email-agraf@suse.de>

From: Michael Neuling <mikey@neuling.org>

Currently kvmppc_start_thread() tries to wake other SMT threads via
xics_wake_cpu().  Unfortunately xics_wake_cpu only exists when
CONFIG_SMP=Y so when compiling with CONFIG_SMP=N we get:

  arch/powerpc/kvm/built-in.o: In function `.kvmppc_start_thread':
  book3s_hv.c:(.text+0xa1e0): undefined reference to `.xics_wake_cpu'

The following should be fine since kvmppc_start_thread() shouldn't
called to start non-zero threads when SMP=N since threads_per_core=1.

Signed-off-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Alexander Graf <agraf@suse.de>
---
 arch/powerpc/kvm/book3s_hv.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c
index 0cb137a..336983d 100644
--- a/arch/powerpc/kvm/book3s_hv.c
+++ b/arch/powerpc/kvm/book3s_hv.c
@@ -538,7 +538,7 @@ static void kvmppc_start_thread(struct kvm_vcpu *vcpu)
 	tpaca->kvm_hstate.napping = 0;
 	vcpu->cpu = vc->pcpu;
 	smp_wmb();
-#ifdef CONFIG_PPC_ICP_NATIVE
+#if defined(CONFIG_PPC_ICP_NATIVE) && defined(CONFIG_SMP)
 	if (vcpu->arch.ptid) {
 		tpaca->cpu_start = 0x80;
 		wmb();
-- 
1.6.0.2

  parent reply	other threads:[~2011-12-25 10:58 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-25 10:58 [PULL 0/7] avi patch queue 2011-12-25 Alexander Graf
2011-12-25 10:58 ` [PATCH 1/7] KVM: PPC: Whitespace fix for kvm.h Alexander Graf
2011-12-25 10:58 ` [PATCH 2/7] KVM: Fix whitespace in kvm_para.h Alexander Graf
2011-12-25 10:58 ` [PATCH 3/7] powerpc/kvm: annotate kvm_rma_init as __init Alexander Graf
2011-12-25 10:58 ` [PATCH 4/7] KVM: PPC: move compute_tlbie_rb to book3s_64 common header Alexander Graf
2011-12-25 10:58 ` [PATCH 5/7] KVM: PPC: protect use of kvmppc_h_pr Alexander Graf
2011-12-25 10:58 ` Alexander Graf [this message]
2011-12-25 10:58 ` [PATCH 7/7] KVM: PPC: e500: include linux/export.h Alexander Graf
2011-12-25 11:03 ` [PULL 0/7] avi patch queue 2011-12-25 Avi Kivity
2011-12-25 11:29   ` Alexander Graf
2011-12-25 11:32     ` Avi Kivity
2011-12-25 11:33       ` Avi Kivity
2011-12-27  9:45 ` Avi Kivity
2012-01-09 12:48   ` Alexander Graf

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1324810715-28312-7-git-send-email-agraf@suse.de \
    --to=agraf@suse.de \
    --cc=avi@redhat.com \
    --cc=kvm-ppc@vger.kernel.org \
    --cc=kvm@vger.kernel.org \
    --cc=mikey@neuling.org \
    --cc=mtosatti@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).