aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/events/intel/lbr.c
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2016-06-30 11:49:08 +0200
committerIngo Molnar <mingo@kernel.org>2016-07-07 09:03:28 +0200
commitaefbc4d04c7b09cb6775a32cea7986c62e489ee2 (patch)
treefa412861addb3ac3a25d1e7aa7f37888ba17a61d /arch/x86/events/intel/lbr.c
parentMerge branch 'perf/urgent' into perf/core, to pick up fixes before merging new changes (diff)
downloadlinux-dev-aefbc4d04c7b09cb6775a32cea7986c62e489ee2.tar.xz
linux-dev-aefbc4d04c7b09cb6775a32cea7986c62e489ee2.zip
perf/x86/intel: Fix rdlbr_to() MSR reading typo
It helps to actually read the right MSR.. Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Vince Weaver <vincent.weaver@maine.edu> Cc: linux-kernel@vger.kernel.org Fixes: d4cf1949f968 ("perf/x86/intel: Add {rd,wr}lbr_{to,from} wrappers") Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to '')
-rw-r--r--arch/x86/events/intel/lbr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/events/intel/lbr.c b/arch/x86/events/intel/lbr.c
index cc4555a9e876..707d358e0dff 100644
--- a/arch/x86/events/intel/lbr.c
+++ b/arch/x86/events/intel/lbr.c
@@ -323,7 +323,7 @@ static inline u64 rdlbr_to(unsigned int idx)
{
u64 val;
- rdmsrl(x86_pmu.lbr_from + idx, val);
+ rdmsrl(x86_pmu.lbr_to + idx, val);
return val;
}