diff options
author | Ingo Molnar <[email protected]> | 2015-08-21 08:14:46 +0200 |
---|---|---|
committer | Ingo Molnar <[email protected]> | 2015-08-21 08:17:01 +0200 |
commit | 82819ffb42fb45197bacf3223191deca31d3eb91 (patch) | |
tree | 7e4d872981d3e7c6cbd9bc7f8bf637b6605a55c8 | |
parent | dd2281be03a7f4d3f249a733913a9ebb36e721f4 (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 <[email protected]>
Cc: Andy Lutomirski <[email protected]>
Cc: Arnaldo Carvalho de Melo <[email protected]>
Cc: Jiri Olsa <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: [email protected]
Signed-off-by: Ingo Molnar <[email protected]>
-rw-r--r-- | arch/x86/kernel/cpu/perf_event_msr.c | 2 |
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) if (event->hw.event_base) rdmsrl(event->hw.event_base, now); else - now = rdtsc(); + rdtscll(now); return now; } |