diff mbox

powerpc kvm: fix kvmppc_start_thread() for CONFIG_SMP=N

Message ID 12283.1320977000@neuling.org (mailing list archive)
State Not Applicable
Headers show

Commit Message

Michael Neuling Nov. 11, 2011, 2:03 a.m. UTC
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>
---
 arch/powerpc/kvm/book3s_hv.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Alexander Graf Nov. 11, 2011, 4:01 p.m. UTC | #1
On 11/11/2011 03:03 AM, Michael Neuling wrote:
> 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>

Thanks, applied to kvm-ppc-next. Please CC kvm-ppc@vger next time :).


Alex
Michael Neuling Nov. 12, 2011, 4:07 a.m. UTC | #2
In message <4EBD46F4.5040503@suse.de> you wrote:
> On 11/11/2011 03:03 AM, Michael Neuling wrote:
> > 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>
> 
> Thanks, applied to kvm-ppc-next. Please CC kvm-ppc@vger next time :).

Thanks will do.

Mikey
diff mbox

Patch

Index: linux-ozlabs/arch/powerpc/kvm/book3s_hv.c
===================================================================
--- linux-ozlabs.orig/arch/powerpc/kvm/book3s_hv.c
+++ linux-ozlabs/arch/powerpc/kvm/book3s_hv.c
@@ -538,7 +538,7 @@  static void kvmppc_start_thread(struct k
 	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();