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

Signed-off-by: Ingo Molnar <mingo@kernel.org>
2016-05-12 10:14:45 +02:00
parent 9ab975a029 6d6f2833bf
commit 5319e5ad0c
3 changed files with 9 additions and 2 deletions
--- 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)