lkml.org 
[lkml]   [2022]   [Feb]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [PATCH 1/2] kvm/x86: rename kvm's read_tsc() as kvm_read_host_tsc()
From
On 2/18/22 23:18, Pete Swain wrote:
> Avoid clash with host driver's INDIRECT_CALLABLE_SCOPE read_tsc()
>
> Signed-off-by: Pete Swain <swine@google.com>
> ---
> arch/x86/kvm/x86.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index 641044db415d..0424d77cd214 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -2632,7 +2632,7 @@ static inline void adjust_tsc_offset_host(struct kvm_vcpu *vcpu, s64 adjustment)
>
> #ifdef CONFIG_X86_64
>
> -static u64 read_tsc(void)
> +static u64 kvm_read_host_tsc(void)
> {
> u64 ret = (u64)rdtsc_ordered();
> u64 last = pvclock_gtod_data.clock.cycle_last;
> @@ -2674,7 +2674,7 @@ static inline u64 vgettsc(struct pvclock_clock *clock, u64 *tsc_timestamp,
> break;
> case VDSO_CLOCKMODE_TSC:
> *mode = VDSO_CLOCKMODE_TSC;
> - *tsc_timestamp = read_tsc();
> + *tsc_timestamp = kvm_read_host_tsc();
> v = (*tsc_timestamp - clock->cycle_last) &
> clock->mask;
> break;

Acked-by: Paolo Bonzini <pbonzini@redhat.com>

Paolo

\
 
 \ /
  Last update: 2022-02-19 09:41    [W:0.067 / U:0.420 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site