Commit ce9555406a478683c4d4641ae8b0b35845084c39

Authored by Stephane Eranian
Committed by Greg Kroah-Hartman
1 parent 09c0adc993

perf/rapl: Fix crash in rapl_scale()

commit 98b008dff8452653909d9263efda925873e8d8bb upstream.

This patch fixes a systematic crash in rapl_scale()
due to an invalid pointer.

The bug was introduced by commit:

  89cbc76768c2 ("x86: Replace __get_cpu_var uses")

The fix is simple. Just put the parenthesis where it needs
to be, i.e., around rapl_pmu. To my surprise, the compiler
was not complaining about passing an integer instead of a
pointer.

Reported-by: Vince Weaver <vincent.weaver@maine.edu>
Tested-by: Vince Weaver <vincent.weaver@maine.edu>
Fixes: 89cbc76768c2 ("x86: Replace __get_cpu_var uses")
Signed-off-by: Stephane Eranian <eranian@google.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: cl@linux.com
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: http://lkml.kernel.org/r/20150122203834.GA10228@thinkpad
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

arch/x86/kernel/cpu/perf_event_intel_rapl.c
... ... @@ -135,7 +135,7 @@
135 135 * or use ldexp(count, -32).
136 136 * Watts = Joules/Time delta
137 137 */
138   - return v << (32 - __this_cpu_read(rapl_pmu->hw_unit));
  138 + return v << (32 - __this_cpu_read(rapl_pmu)->hw_unit);
139 139 }
140 140  
141 141 static u64 rapl_event_update(struct perf_event *event)