aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-08-21 02:14:46 -0400
committerIngo Molnar <mingo@kernel.org>2015-08-21 02:17:01 -0400
commit82819ffb42fb45197bacf3223191deca31d3eb91 (patch)
tree7e4d872981d3e7c6cbd9bc7f8bf637b6605a55c8
parentdd2281be03a7f4d3f249a733913a9ebb36e721f4 (diff)
perf/x86/msr: Fix the MSR driver build
The new MSR PMU driver made use of rdtsc() which does not exist (yet) in this tree: arch/x86/kernel/cpu/perf_event_msr.c:91:3: error: implicit declaration of function 'rdtsc' Use the old rdtscll() primitive for now. Reported-by: kbuild test robot <fengguang.wu@intel.com> Cc: Andy Lutomirski <luto@amacapital.net> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linux-kernel@vger.kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r--arch/x86/kernel/cpu/perf_event_msr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/perf_event_msr.c b/arch/x86/kernel/cpu/perf_event_msr.c
index b0dd2e8a6d12..086b12eae794 100644
--- a/arch/x86/kernel/cpu/perf_event_msr.c
+++ b/arch/x86/kernel/cpu/perf_event_msr.c
@@ -145,7 +145,7 @@ static inline u64 msr_read_counter(struct perf_event *event)
145 if (event->hw.event_base) 145 if (event->hw.event_base)
146 rdmsrl(event->hw.event_base, now); 146 rdmsrl(event->hw.event_base, now);
147 else 147 else
148 now = rdtsc(); 148 rdtscll(now);
149 149
150 return now; 150 return now;
151} 151}