Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / arch / x86 / kvm / pmu_amd.c

diff --git a/arch/x86/kvm/pmu_amd.c b/arch/x86/kvm/pmu_amd.c
index 886aa25a7131479b5acd64d4aa9f1600984335d2..39b91127ef07a48a3cf4313d2d0340088bf8b7c6 100644 (file)
--- a/arch/x86/kvm/pmu_amd.c
+++ b/arch/x86/kvm/pmu_amd.c
@@ -133,8 +133,6 @@ static int amd_pmu_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
        /* MSR_K7_PERFCTRn */
        pmc = get_gp_pmc(pmu, msr, MSR_K7_PERFCTR0);
        if (pmc) {
-               if (!msr_info->host_initiated)
-                       data = (s64)data;
                pmc->counter += data - pmc_read_counter(pmc);
                return 0;
        }