From 7752508d3123bda967e7de5a3d210649b71673d4 Mon Sep 17 00:00:00 2001 From: Gleb Natapov Date: Sun, 26 Feb 2012 16:55:41 +0200 Subject: [PATCH] --- yaml --- r: 297167 b: refs/heads/master c: fac3368310765ade6bbdf07c9acdb04210e8b5b0 h: refs/heads/master i: 297165: 79b0b73d15f7111fdcd32c9b738287bd496cfaed 297163: aba81af20beef770d23f9c502fd663ae31c4616d 297159: 6a0b681fc82b33c369d708412889209aa970f5b5 297151: 622af671894ac83cd50c5891e032835ab3d34493 v: v3 --- [refs] | 2 +- trunk/arch/x86/kvm/pmu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 28fc409d3a0b..608b8569446e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a7b9d2ccc3d86303ee9314612d301966e04011c7 +refs/heads/master: fac3368310765ade6bbdf07c9acdb04210e8b5b0 diff --git a/trunk/arch/x86/kvm/pmu.c b/trunk/arch/x86/kvm/pmu.c index 6af9a542e541..b52a8ed283b2 100644 --- a/trunk/arch/x86/kvm/pmu.c +++ b/trunk/arch/x86/kvm/pmu.c @@ -223,7 +223,7 @@ static void reprogram_gp_counter(struct kvm_pmc *pmc, u64 eventsel) event_select = eventsel & ARCH_PERFMON_EVENTSEL_EVENT; unit_mask = (eventsel & ARCH_PERFMON_EVENTSEL_UMASK) >> 8; - if (!(event_select & (ARCH_PERFMON_EVENTSEL_EDGE | + if (!(eventsel & (ARCH_PERFMON_EVENTSEL_EDGE | ARCH_PERFMON_EVENTSEL_INV | ARCH_PERFMON_EVENTSEL_CMASK))) { config = find_arch_event(&pmc->vcpu->arch.pmu, event_select,