Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[sfrench/cifs-2.6.git] / arch / x86 / kvm / vmx / pmu_intel.c

diff --git a/arch/x86/kvm/vmx/pmu_intel.c b/arch/x86/kvm/vmx/pmu_intel.c
index efa172a7278e9b91bdeacbe9a64dd3c9d4e98571..bc3f8512bb646d76339886342699d369dd827a5b 100644 (file)
--- a/arch/x86/kvm/vmx/pmu_intel.c
+++ b/arch/x86/kvm/vmx/pmu_intel.c
@@ -574,7 +574,7 @@ static void intel_pmu_init(struct kvm_vcpu *vcpu)
                pmu->gp_counters[i].current_config = 0;
        }
 
-       for (i = 0; i < INTEL_PMC_MAX_FIXED; i++) {
+       for (i = 0; i < KVM_PMC_MAX_FIXED; i++) {
                pmu->fixed_counters[i].type = KVM_PMC_FIXED;
                pmu->fixed_counters[i].vcpu = vcpu;
                pmu->fixed_counters[i].idx = i + INTEL_PMC_IDX_FIXED;
@@ -600,7 +600,7 @@ static void intel_pmu_reset(struct kvm_vcpu *vcpu)
                pmc->counter = pmc->eventsel = 0;
        }
 
-       for (i = 0; i < INTEL_PMC_MAX_FIXED; i++) {
+       for (i = 0; i < KVM_PMC_MAX_FIXED; i++) {
                pmc = &pmu->fixed_counters[i];
 
                pmc_stop_counter(pmc);