diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:27:56 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:27:56 +0200 |
| commit | 97e6722b8d6b5880c4d5751127d5083b1b7df27d (patch) | |
| tree | 060c52298d42530f975064f7addc4e637fe00289 /include/asm-x86/kvm_host.h | |
| parent | f22f9a89ce6857d377bf22dba4c1a8cd256c5136 (diff) | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
Merge branch 'linus' into tracing/ftrace
Diffstat (limited to 'include/asm-x86/kvm_host.h')
| -rw-r--r-- | include/asm-x86/kvm_host.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-x86/kvm_host.h b/include/asm-x86/kvm_host.h index 1d8cd01fa51..844f2a89afb 100644 --- a/include/asm-x86/kvm_host.h +++ b/include/asm-x86/kvm_host.h @@ -18,6 +18,7 @@ #include <linux/kvm_para.h> #include <linux/kvm_types.h> +#include <asm/pvclock-abi.h> #include <asm/desc.h> #define KVM_MAX_VCPUS 16 @@ -282,7 +283,8 @@ struct kvm_vcpu_arch { struct x86_emulate_ctxt emulate_ctxt; gpa_t time; - struct kvm_vcpu_time_info hv_clock; + struct pvclock_vcpu_time_info hv_clock; + unsigned int hv_clock_tsc_khz; unsigned int time_offset; struct page *time_page; }; |