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

Commit 3443eb44 authored by Zelin Deng's avatar Zelin Deng Committed by Greg Kroah-Hartman
Browse files

x86/kvmclock: Move this_cpu_pvti into kvmclock.h 



commit ad9af930680bb396c87582edc172b3a7cf2a3fbf upstream.

There're other modules might use hv_clock_per_cpu variable like ptp_kvm,
so move it into kvmclock.h and export the symbol to make it visiable to
other modules.

Signed-off-by: default avatarZelin Deng <zelin.deng@linux.alibaba.com>
Cc: <stable@vger.kernel.org>
Message-Id: <1632892429-101194-2-git-send-email-zelin.deng@linux.alibaba.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 50149e08

arch/x86/include/asm/kvmclock.h

+14 −0
Original line number Diff line number Diff line
@@ -2,6 +2,20 @@ 
#ifndef _ASM_X86_KVM_CLOCK_H

#define _ASM_X86_KVM_CLOCK_H



#include <linux/percpu.h>



extern struct clocksource kvm_clock;



DECLARE_PER_CPU(struct pvclock_vsyscall_time_info *, hv_clock_per_cpu);



static inline struct pvclock_vcpu_time_info *this_cpu_pvti(void)

{

	return &this_cpu_read(hv_clock_per_cpu)->pvti;

}



static inline struct pvclock_vsyscall_time_info *this_cpu_hvclock(void)

{

	return this_cpu_read(hv_clock_per_cpu);

}



#endif /* _ASM_X86_KVM_CLOCK_H */

arch/x86/kernel/kvmclock.c

+2 −11
Original line number Diff line number Diff line
@@ -50,18 +50,9 @@ early_param("no-kvmclock-vsyscall", parse_no_kvmclock_vsyscall); 
static struct pvclock_vsyscall_time_info

			hv_clock_boot[HVC_BOOT_ARRAY_SIZE] __bss_decrypted __aligned(PAGE_SIZE);

static struct pvclock_wall_clock wall_clock __bss_decrypted;

static DEFINE_PER_CPU(struct pvclock_vsyscall_time_info *, hv_clock_per_cpu);

static struct pvclock_vsyscall_time_info *hvclock_mem;



static inline struct pvclock_vcpu_time_info *this_cpu_pvti(void)

{

	return &this_cpu_read(hv_clock_per_cpu)->pvti;

}



static inline struct pvclock_vsyscall_time_info *this_cpu_hvclock(void)

{

	return this_cpu_read(hv_clock_per_cpu);

}

DEFINE_PER_CPU(struct pvclock_vsyscall_time_info *, hv_clock_per_cpu);

EXPORT_PER_CPU_SYMBOL_GPL(hv_clock_per_cpu);



/*

 * The wallclock is the time of day when we booted. Since then, some time may