lkml.org 
[lkml]   [2017]   [Oct]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 62/64] KVM: VMX: use cmpxchg64
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

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

    From: Paolo Bonzini <pbonzini@redhat.com>

    commit c0a1666bcb2a33e84187a15eabdcd54056be9a97 upstream.

    This fixes a compilation failure on 32-bit systems.

    Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/x86/kvm/vmx.c | 12 ++++++------
    1 file changed, 6 insertions(+), 6 deletions(-)

    --- a/arch/x86/kvm/vmx.c
    +++ b/arch/x86/kvm/vmx.c
    @@ -2203,8 +2203,8 @@ static void vmx_vcpu_pi_load(struct kvm_
    new.ndst = (dest << 8) & 0xFF00;

    new.sn = 0;
    - } while (cmpxchg(&pi_desc->control, old.control,
    - new.control) != old.control);
    + } while (cmpxchg64(&pi_desc->control, old.control,
    + new.control) != old.control);
    }

    static void decache_tsc_multiplier(struct vcpu_vmx *vmx)
    @@ -11039,8 +11039,8 @@ static void __pi_post_block(struct kvm_v

    /* set 'NV' to 'notification vector' */
    new.nv = POSTED_INTR_VECTOR;
    - } while (cmpxchg(&pi_desc->control, old.control,
    - new.control) != old.control);
    + } while (cmpxchg64(&pi_desc->control, old.control,
    + new.control) != old.control);

    if (!WARN_ON_ONCE(vcpu->pre_pcpu == -1)) {
    spin_lock(&per_cpu(blocked_vcpu_on_cpu_lock, vcpu->pre_pcpu));
    @@ -11109,8 +11109,8 @@ static int pi_pre_block(struct kvm_vcpu

    /* set 'NV' to 'wakeup vector' */
    new.nv = POSTED_INTR_WAKEUP_VECTOR;
    - } while (cmpxchg(&pi_desc->control, old.control,
    - new.control) != old.control);
    + } while (cmpxchg64(&pi_desc->control, old.control,
    + new.control) != old.control);

    /* We should not block the vCPU if an interrupt is posted for it. */
    if (pi_test_on(pi_desc) == 1)

    \
     
     \ /
      Last update: 2017-10-03 14:29    [W:4.659 / U:0.120 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site