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>

diff --git a/arch/x86/events/msr.c b/arch/x86/events/msr.c
index 18e2628e2d8f7da6f2e124d0506733fc6e84c809..e7edf19e64c27c5ecb5eacfb06d139ea28b290f4 100644 (file)
--- 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;

diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h
index 30df295f6d94c8ac6d87613acae8a32c50436c6d..392f05d57e78aafa867d61e7211c1e313ce24f3a 100644 (file)
--- a/arch/x86/include/asm/msr.h
+++ b/arch/x86/include/asm/msr.h
@@ -218,9 +218,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);

diff --git a/arch/x86/kernel/cpu/mcheck/mce-inject.c b/arch/x86/kernel/cpu/mcheck/mce-inject.c
index 231ad23b24a98ee59b0b232f038592b405c9e66b..475cb4f5f14fac3e2b4579b9ee1bec3948708bbc 100644 (file)
--- a/arch/x86/kernel/cpu/mcheck/mce-inject.c
+++ b/arch/x86/kernel/cpu/mcheck/mce-inject.c
@@ -491,7 +491,7 @@ static void do_inject(void)
        unsigned int cpu = i_mce.extcpu;
        u8 b = i_mce.bank;
 
-       rdtscll(i_mce.tsc);
+       i_mce.tsc = rdtsc_ordered();
 
        if (i_mce.misc)
                i_mce.status |= MCI_STATUS_MISCV;