projects
/
platform
/
kernel
/
linux-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
perf/rapl: Fix crash in rapl_scale()
[platform/kernel/linux-stable.git]
/
arch
/
x86
/
kernel
/
cpu
/
perf_event_intel_rapl.c
diff --git
a/arch/x86/kernel/cpu/perf_event_intel_rapl.c
b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
index
6e434f8
..
c4bb8b8
100644
(file)
--- a/
arch/x86/kernel/cpu/perf_event_intel_rapl.c
+++ b/
arch/x86/kernel/cpu/perf_event_intel_rapl.c
@@
-142,7
+142,7
@@
static inline u64 rapl_scale(u64 v)
* or use ldexp(count, -32).
* Watts = Joules/Time delta
*/
- return v << (32 - __this_cpu_read(rapl_pmu
->hw_unit)
);
+ return v << (32 - __this_cpu_read(rapl_pmu
)->hw_unit
);
}
static u64 rapl_event_update(struct perf_event *event)