diff options
| author | Thomas Gleixner | 2018-03-23 00:05:29 +0100 |
|---|---|---|
| committer | Thomas Gleixner | 2018-03-23 20:07:54 +0100 |
| commit | ea89c065482179b2bf9f9b6788b06a6e0c68a73b (patch) | |
| tree | 79bb7d7bed31d52a61214531573abd927ceb5564 /arch/x86/events/msr.c | |
| parent | fc804f65d46236c211f530174904c1ed70db5888 (diff) | |
x86/tsc: Get rid of rdtscll()
Commit 99770737ca7e ("x86/asm/tsc: Add rdtscll() merge helper") added
rdtscll() in August 2015 along with the comment:
/* Deprecated, keep it for a cycle for easier merging: */
12 cycles later it's really overdue for removal.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/events/msr.c')
| -rw-r--r-- | arch/x86/events/msr.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/events/msr.c b/arch/x86/events/msr.c index 18e2628e2d8f..e7edf19e64c2 100644 --- a/arch/x86/events/msr.c +++ b/arch/x86/events/msr.c @@ -188,10 +188,11 @@ static inline u64 msr_read_counter(struct perf_event *event) if (event->hw.event_base) rdmsrl(event->hw.event_base, now); else - rdtscll(now); + now = rdtsc_ordered(); return now; } + static void msr_event_update(struct perf_event *event) { u64 prev, now; |