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>

diff --git a/arch/x86/kernel/cpu/perf_event_msr.c b/arch/x86/kernel/cpu/perf_event_msr.c
index b0dd2e8a6d12f23b5f158c0cddf7e166a1a46c22..086b12eae79493329c8792538ea8c6f179aee4fb 100644 (file)
--- 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)
        if (event->hw.event_base)
                rdmsrl(event->hw.event_base, now);
        else
-               now = rdtsc();
+               rdtscll(now);
 
        return now;
 }