From: Marcelo Tosatti mtosatti@redhat.com
To be used by KVM PTP driver.
Signed-off-by: Marcelo Tosatti mtosatti@redhat.com Signed-off-by: Paolo Bonzini pbonzini@redhat.com (cherry picked from commit f4066c2bc4d0de4e5dcbff21dae41e89fe8f38c0) Signed-off-by: Juerg Haefliger juerg.haefliger@canonical.com --- arch/x86/include/asm/kvmclock.h | 6 ++++++ arch/x86/kernel/kvmclock.c | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 arch/x86/include/asm/kvmclock.h
diff --git a/arch/x86/include/asm/kvmclock.h b/arch/x86/include/asm/kvmclock.h new file mode 100644 index 000000000000..f260bef63591 --- /dev/null +++ b/arch/x86/include/asm/kvmclock.h @@ -0,0 +1,6 @@ +#ifndef _ASM_X86_KVM_CLOCK_H +#define _ASM_X86_KVM_CLOCK_H + +extern struct clocksource kvm_clock; + +#endif /* _ASM_X86_KVM_CLOCK_H */ diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c index a2de9bc7ac0b..321c2acf0025 100644 --- a/arch/x86/kernel/kvmclock.c +++ b/arch/x86/kernel/kvmclock.c @@ -27,6 +27,7 @@
#include <asm/x86_init.h> #include <asm/reboot.h> +#include <asm/kvmclock.h>
static int kvmclock = 1; static int msr_kvm_system_time = MSR_KVM_SYSTEM_TIME; @@ -146,13 +147,14 @@ bool kvm_check_and_clear_guest_paused(void) return ret; }
-static struct clocksource kvm_clock = { +struct clocksource kvm_clock = { .name = "kvm-clock", .read = kvm_clock_get_cycles, .rating = 400, .mask = CLOCKSOURCE_MASK(64), .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; +EXPORT_SYMBOL_GPL(kvm_clock);
int kvm_register_clock(char *txt) {