From patchwork Thu Sep 28 15:58:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 9976361 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D298B6034B for ; Thu, 28 Sep 2017 15:59:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C532429644 for ; Thu, 28 Sep 2017 15:59:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B9FEC29659; Thu, 28 Sep 2017 15:59:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 761A829644 for ; Thu, 28 Sep 2017 15:59:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752035AbdI1P7E (ORCPT ); Thu, 28 Sep 2017 11:59:04 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:56051 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751372AbdI1P7C (ORCPT ); Thu, 28 Sep 2017 11:59:02 -0400 Received: by mail-wm0-f68.google.com with SMTP id u138so3201257wmu.4; Thu, 28 Sep 2017 08:59:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id; bh=/JJCIU90U9gX/gSqT6iM02DDZG+Er65QSa++hxMp1qY=; b=FKLCoez34OBTFjDn5pt0YJbMysOvmVpDPZCFH0W/H+jGF6UEJTE8OHua7F47hJ+Slf FjQw/VzihqJufmvlyoDIozcGKRiCb4bfM663ouze7wxS3Mkf+10FMFmUYQtEONZTni03 it0b78yqsYJxDHz/3DlB8M8dWnC5NkYyRbq4rxVS3ZtT7tjTXwpmVV1/DJsrpL+1G43M wpaYf2FmbuGmsOXVhDihOAEH/N5+pTok8yo/TVypZWIThpcw2H5lfeWn85Qnlvz2cwy2 2F0W2aM7e1pnGHzPsJpgIlXwZp77D+Fit7RFp/qWsN/DOnpR+IpCMig5xFO4X4H5Sn+/ 8xcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id; bh=/JJCIU90U9gX/gSqT6iM02DDZG+Er65QSa++hxMp1qY=; b=RqjImXNnfdfpZvrc4XEoSKoD897LqaNtJlpbLfS7a7TjM6Su4MQXkxYLQpqsQtjGrE 21PkPJ+L6RhRl2EdKoRS6XQVYBWK6haDt4KLkpC3JDGSMEben0DLR9enKj7XuauW0Tn3 QmI/YnBLUxtiBh3Qz7n780WLK6V5e7Vlz/iKqS054ursQv2/aJwYtowEROyOop6elfOl cMfdv/Ai8PuBGTjLl9RvomQcIEarthG+aTwyZNOKzA4M+CxkZIYtZwlI7uIRmzf+Uagt QrsU5UGaGGSiw84waOb85pgN6P5ciCuB5jR1d20+Lz1bSIfHmgooY/ldVCRdi0Go8aa0 WjoA== X-Gm-Message-State: AHPjjUhSum/ABDG3yTEEcMijqfeLfyQB7pOtrKYlUJO25NdJdAbIpdyZ CmNMnZikZPTmbrP6/g3LoOYLjq6d X-Google-Smtp-Source: AOwi7QCe89OTLEd0KhITGB21MHONmB5XG98GeJrOxsB/eu63LxJNmTIQtuxVZNrmf8GdrVLWQa5ibg== X-Received: by 10.28.147.8 with SMTP id v8mr1647977wmd.104.1506614340819; Thu, 28 Sep 2017 08:59:00 -0700 (PDT) Received: from 640k.lan (dynamic-adsl-78-12-246-117.clienti.tiscali.it. [78.12.246.117]) by smtp.gmail.com with ESMTPSA id n57sm3133765wrn.29.2017.09.28.08.58.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Sep 2017 08:58:59 -0700 (PDT) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Subject: [PATCH] KVM: VMX: use cmpxchg64 Date: Thu, 28 Sep 2017 17:58:57 +0200 Message-Id: <1506614337-14744-1-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This fixes a compilation failure on 32-bit systems. Signed-off-by: Paolo Bonzini --- arch/x86/kvm/vmx.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index b9d2140eb212..7f62c94196d1 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -2238,8 +2238,8 @@ static void vmx_vcpu_pi_load(struct kvm_vcpu *vcpu, int cpu) 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) @@ -11730,8 +11730,8 @@ static void __pi_post_block(struct kvm_vcpu *vcpu) /* 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)); @@ -11800,8 +11800,8 @@ static int pi_pre_block(struct kvm_vcpu *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)