Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea89c065 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

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

arch/x86/events/msr.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

arch/x86/include/asm/msr.h

+0 −3
Original line number Diff line number Diff line
@@ -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);

arch/x86/kernel/cpu/mcheck/mce-inject.c

+1 −1
Original line number Diff line number Diff line
@@ -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;