diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2018-03-23 00:05:29 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2018-03-23 20:07:54 +0100 |
| commit | ea89c065482179b2bf9f9b6788b06a6e0c68a73b (patch) | |
| tree | 79bb7d7bed31d52a61214531573abd927ceb5564 /arch/x86/kernel/cpu/mcheck | |
| parent | x86/tsc: Convert ART in nanoseconds to TSC (diff) | |
| download | linux-dev-ea89c065482179b2bf9f9b6788b06a6e0c68a73b.tar.xz linux-dev-ea89c065482179b2bf9f9b6788b06a6e0c68a73b.zip | |
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>
Diffstat (limited to 'arch/x86/kernel/cpu/mcheck')
| -rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce-inject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce-inject.c b/arch/x86/kernel/cpu/mcheck/mce-inject.c index 231ad23b24a9..475cb4f5f14f 100644 --- 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; |