Commit ea89c065 authored by Thomas Gleixner's avatar Thomas Gleixner

x86/tsc: Get rid of rdtscll()

Commit 99770737 ("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: default avatarThomas Gleixner <tglx@linutronix.de>
parent fc804f65
...@@ -188,10 +188,11 @@ static inline u64 msr_read_counter(struct perf_event *event) ...@@ -188,10 +188,11 @@ static inline u64 msr_read_counter(struct perf_event *event)
if (event->hw.event_base) if (event->hw.event_base)
rdmsrl(event->hw.event_base, now); rdmsrl(event->hw.event_base, now);
else else
rdtscll(now); now = rdtsc_ordered();
return now; return now;
} }
static void msr_event_update(struct perf_event *event) static void msr_event_update(struct perf_event *event)
{ {
u64 prev, now; u64 prev, now;
......
...@@ -218,9 +218,6 @@ static __always_inline unsigned long long rdtsc_ordered(void) ...@@ -218,9 +218,6 @@ static __always_inline unsigned long long rdtsc_ordered(void)
return rdtsc(); 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) static inline unsigned long long native_read_pmc(int counter)
{ {
DECLARE_ARGS(val, low, high); DECLARE_ARGS(val, low, high);
......
...@@ -491,7 +491,7 @@ static void do_inject(void) ...@@ -491,7 +491,7 @@ static void do_inject(void)
unsigned int cpu = i_mce.extcpu; unsigned int cpu = i_mce.extcpu;
u8 b = i_mce.bank; u8 b = i_mce.bank;
rdtscll(i_mce.tsc); i_mce.tsc = rdtsc_ordered();
if (i_mce.misc) if (i_mce.misc)
i_mce.status |= MCI_STATUS_MISCV; i_mce.status |= MCI_STATUS_MISCV;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment