diff options
| author | Martin Kepplinger <martink@posteo.de> | 2015-11-06 19:31:08 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-06 20:50:42 -0500 |
| commit | 78e3c7951021b4e1a554b3d619506b55b0619073 (patch) | |
| tree | 551b6effe854c1a463140f79ad80ccb685d344f6 /arch/x86/kernel/cpu/perf_event_msr.c | |
| parent | 06d8f8178c5709ff21cfbe16b6c078d2669b6e80 (diff) | |
arch/x86/kernel/cpu/perf_event_msr.c: use sign_extend64() for sign extension
Signed-off-by: Martin Kepplinger <martin.kepplinger@theobroma-systems.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: George Spelvin <linux@horizon.com>
Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: Maxime Coquelin <maxime.coquelin@st.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: Yury Norov <yury.norov@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/x86/kernel/cpu/perf_event_msr.c')
| -rw-r--r-- | arch/x86/kernel/cpu/perf_event_msr.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/x86/kernel/cpu/perf_event_msr.c b/arch/x86/kernel/cpu/perf_event_msr.c index f32ac13934f2..ec863b9a9f78 100644 --- a/arch/x86/kernel/cpu/perf_event_msr.c +++ b/arch/x86/kernel/cpu/perf_event_msr.c | |||
| @@ -163,10 +163,9 @@ again: | |||
| 163 | goto again; | 163 | goto again; |
| 164 | 164 | ||
| 165 | delta = now - prev; | 165 | delta = now - prev; |
| 166 | if (unlikely(event->hw.event_base == MSR_SMI_COUNT)) { | 166 | if (unlikely(event->hw.event_base == MSR_SMI_COUNT)) |
| 167 | delta <<= 32; | 167 | delta = sign_extend64(delta, 31); |
| 168 | delta >>= 32; /* sign extend */ | 168 | |
| 169 | } | ||
| 170 | local64_add(now - prev, &event->count); | 169 | local64_add(now - prev, &event->count); |
| 171 | } | 170 | } |
| 172 | 171 | ||