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/kvm/svm.c | |
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/kvm/svm.c')
-rw-r--r-- | arch/x86/kvm/svm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index 602b974a60a6..8dfbad7a2c44 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c | |||
@@ -1080,7 +1080,7 @@ static u64 svm_compute_tsc_offset(struct kvm_vcpu *vcpu, u64 target_tsc) | |||
1080 | { | 1080 | { |
1081 | u64 tsc; | 1081 | u64 tsc; |
1082 | 1082 | ||
1083 | tsc = svm_scale_tsc(vcpu, native_read_tsc()); | 1083 | tsc = svm_scale_tsc(vcpu, rdtsc()); |
1084 | 1084 | ||
1085 | return target_tsc - tsc; | 1085 | return target_tsc - tsc; |
1086 | } | 1086 | } |
@@ -3079,7 +3079,7 @@ static int svm_get_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) | |||
3079 | switch (msr_info->index) { | 3079 | switch (msr_info->index) { |
3080 | case MSR_IA32_TSC: { | 3080 | case MSR_IA32_TSC: { |
3081 | msr_info->data = svm->vmcb->control.tsc_offset + | 3081 | msr_info->data = svm->vmcb->control.tsc_offset + |
3082 | svm_scale_tsc(vcpu, native_read_tsc()); | 3082 | svm_scale_tsc(vcpu, rdtsc()); |
3083 | 3083 | ||
3084 | break; | 3084 | break; |
3085 | } | 3085 | } |