lkml.org 
[lkml]   [2014]   [Feb]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13 126/140] KVM: PPC: Book3S HV: use xics_wake_cpu only when defined
    Date
    3.13-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Andreas Schwab <schwab@linux-m68k.org>

    commit 48eaef0518a565d3852e301c860e1af6a6db5a84 upstream.

    Signed-off-by: Andreas Schwab <schwab@linux-m68k.org>
    Signed-off-by: Alexander Graf <agraf@suse.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/powerpc/kvm/book3s_hv.c | 7 ++++++-
    1 file changed, 6 insertions(+), 1 deletion(-)

    --- a/arch/powerpc/kvm/book3s_hv.c
    +++ b/arch/powerpc/kvm/book3s_hv.c
    @@ -85,10 +85,13 @@ static void kvmppc_fast_vcpu_kick_hv(str

    /* CPU points to the first thread of the core */
    if (cpu != me && cpu >= 0 && cpu < nr_cpu_ids) {
    +#ifdef CONFIG_KVM_XICS
    int real_cpu = cpu + vcpu->arch.ptid;
    if (paca[real_cpu].kvm_hstate.xics_phys)
    xics_wake_cpu(real_cpu);
    - else if (cpu_online(cpu))
    + else
    +#endif
    + if (cpu_online(cpu))
    smp_send_reschedule(cpu);
    }
    put_cpu();
    @@ -1189,7 +1192,9 @@ static void kvmppc_start_thread(struct k
    smp_wmb();
    #if defined(CONFIG_PPC_ICP_NATIVE) && defined(CONFIG_SMP)
    if (vcpu->arch.ptid) {
    +#ifdef CONFIG_KVM_XICS
    xics_wake_cpu(cpu);
    +#endif
    ++vc->n_woken;
    }
    #endif



    \
     
     \ /
      Last update: 2014-02-05 05:41    [W:4.797 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site