Merge branch 'perf/urgent' into perf/core, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/x86/events/msr.c b/arch/x86/events/msr.c
index 7111400a1f9a..85ef3c2e80e0 100644
--- a/arch/x86/events/msr.c
+++ b/arch/x86/events/msr.c
@@ -182,7 +182,7 @@ again:
         if (unlikely(event->hw.event_base == MSR_SMI_COUNT))
                 delta = sign_extend64(delta, 31);
 
-        local64_add(now - prev, &event->count);
+        local64_add(delta, &event->count);
 }
 
 static void msr_event_start(struct perf_event *event, int flags)