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/include/asm/msr.h | |
| parent | cea061e455c88312b86142e68c8fc5b8e1294ca2 (diff) | |
| parent | ea89c065482179b2bf9f9b6788b06a6e0c68a73b (diff) | |
| download | linux-0-day-a5532439ebab93e47784effb96aafa7d7ba4b760.tar.gz linux-0-day-a5532439ebab93e47784effb96aafa7d7ba4b760.tar.xz | |
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/include/asm/msr.h')
| -rw-r--r-- | arch/x86/include/asm/msr.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h index 77254c9c8f61e..04addd6e0a4a2 100644 --- a/arch/x86/include/asm/msr.h +++ b/arch/x86/include/asm/msr.h @@ -232,9 +232,6 @@ static __always_inline unsigned long long rdtsc_ordered(void) return rdtsc(); } -/* Deprecated, keep it for a cycle for easier merging: */ -#define rdtscll(now) do { (now) = rdtsc_ordered(); } while (0) - static inline unsigned long long native_read_pmc(int counter) { DECLARE_ARGS(val, low, high); |