diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-05-12 10:14:45 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-05-12 10:14:45 +0200 |
| commit | 5319e5ad0c4ed416d00515c96f493653f9929c65 (patch) | |
| tree | 29b26be1459e65c5d9661b6b9963457179137d93 /arch/x86/events/msr.c | |
| parent | Merge tag 'perf-core-for-mingo-20160511' of git://git.kernel.org/pub/scm/linu... (diff) | |
| parent | perf/x86: Fix undefined shift on 32-bit kernels (diff) | |
| download | linux-5319e5ad0c4ed416d00515c96f493653f9929c65.tar.xz linux-5319e5ad0c4ed416d00515c96f493653f9929c65.zip | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/events/msr.c')
| -rw-r--r-- | arch/x86/events/msr.c | 2 |
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) |