diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-02 16:18:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-02 16:18:31 -0700 |
| commit | a5532439ebab93e47784effb96aafa7d7ba4b760 (patch) | |
| tree | 82a8e88870ec995a3139d0afdfe246407db44ad6 /arch/x86/events | |
| parent | cea061e455c88312b86142e68c8fc5b8e1294ca2 (diff) | |
| parent | ea89c065482179b2bf9f9b6788b06a6e0c68a73b (diff) | |
Merge branch 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 timer updates from Ingo Molnar:
"Two changes: add the new convert_art_ns_to_tsc() API for upcoming
Intel Goldmont+ drivers, and remove the obsolete rdtscll() API"
* 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/tsc: Get rid of rdtscll()
x86/tsc: Convert ART in nanoseconds to TSC
Diffstat (limited to 'arch/x86/events')
| -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; |