diff options
author | Andy Lutomirski <luto@kernel.org> | 2015-06-25 12:44:07 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-07-06 09:23:28 -0400 |
commit | 4ea1636b04dbd66536fa387bae2eea463efc705b (patch) | |
tree | 02067d97d1f200b280df8df114b77f26ff1b8e89 /arch/x86/include/asm/pvclock.h | |
parent | fe47ae6e1a5005b2e82f7eab57b5c3820453293a (diff) |
x86/asm/tsc: Rename native_read_tsc() to rdtsc()
Now that there is no paravirt TSC, the "native" is
inappropriate. The function does RDTSC, so give it the obvious
name: rdtsc().
Suggested-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Andy Lutomirski <luto@kernel.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Huang Rui <ray.huang@amd.com>
Cc: John Stultz <john.stultz@linaro.org>
Cc: Len Brown <lenb@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: kvm ML <kvm@vger.kernel.org>
Link: http://lkml.kernel.org/r/fd43e16281991f096c1e4d21574d9e1402c62d39.1434501121.git.luto@kernel.org
[ Ported it to v4.2-rc1. ]
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/pvclock.h')
-rw-r--r-- | arch/x86/include/asm/pvclock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/pvclock.h b/arch/x86/include/asm/pvclock.h index 2bd69d62c623..5c490db62e32 100644 --- a/arch/x86/include/asm/pvclock.h +++ b/arch/x86/include/asm/pvclock.h | |||
@@ -62,7 +62,7 @@ static inline u64 pvclock_scale_delta(u64 delta, u32 mul_frac, int shift) | |||
62 | static __always_inline | 62 | static __always_inline |
63 | u64 pvclock_get_nsec_offset(const struct pvclock_vcpu_time_info *src) | 63 | u64 pvclock_get_nsec_offset(const struct pvclock_vcpu_time_info *src) |
64 | { | 64 | { |
65 | u64 delta = native_read_tsc() - src->tsc_timestamp; | 65 | u64 delta = rdtsc() - src->tsc_timestamp; |
66 | return pvclock_scale_delta(delta, src->tsc_to_system_mul, | 66 | return pvclock_scale_delta(delta, src->tsc_to_system_mul, |
67 | src->tsc_shift); | 67 | src->tsc_shift); |
68 | } | 68 | } |